Last commit before refactoring whitespace back into it.