Continued work on parser. This will be rewritten soon, but is included here in case of future need.