Work on parser, merged dev