Wow - I should commit this stuff more often