Nightly commit, 27 May 2014. Mostly just notes for the parse algorithm
revamp.