Initial work on parser.
Simplified regex.