Initial commit of new parser. Not complete