Commit some changes I had managed to lose last night while refactoring the code....