Added the actual parser.
Merged and fixed conflicts