Starting to fill out parser.
Merge mme and Bo's changes.