basic parser and test stuff and more love