Stuff

Figured I should put this to master instead of bef.