Lots of stuff

First time I tried to commit, it blew up, so I am doing it in piece.