Added parser, renamed some things