Added basic parser + tests