Committing this evening's stuff

There should be commented code in here for you with the TODO marker, I
think.