Fixed a bunch of stuff
Adding parser