Updated Parser

Almost finished - still need to do submit, input