Finished parser

Needs serious relooking