Update parser and Makefile
None of this works, ignore it all
Add all new files