Changes according to my code review comments and a couple of little things in order to get it to talk to hakken and stuff