Awful awful awful parsing issues
Rollback and repair
Submit version done, with comments
Final version for submission