Initial commit - untested stuff

Commit of some untested stuff with comments about what to check
so that I don't forget.