Dev

Tests working on parser.