modifying parser to use new class style
pushing for now, need to write more tests