Nightly commit, 29 May 2014. Still preparing for the parse rework
tomorrow.