Starting from near scratch

Took out a lot of Ivar's tricks because I don't know how to do that on
my own yet.