Yes, you are doing it right. Just be careful. It sounds like you are really pushing it in a good way right now but be willing to back off if the borderline between soreness and injury gets crossed. Just be aware. Xfit can be a real blast but I have heard lots of stories about people getting so *into* it that they hurt themselves.