Committing the code in its current (broken) state, just so everything is up-to-date so I can get back to making incremental commits.