Updated Parser

Made a hand-rolled parser for testing