More cleanup
Starting work on the parser