WIP killage of old parsers
WIP killing old tests
WIP more fleshing out