merged with master and got a lot of crap working