refactoring the parser a bit to make it more concise
Moved bodyparser higher up in the stack... fixed a bizarre undefined file problme