Add draft for parser
Switch to cleaner parsing system
Better parsing error message