Final commit before break, contains playable build.