Work is slow going, and I'm starting to discover more and more bugs..