progress on parser
more progress on parser, kinda ghetto