So that takes care of most of it. Going to go back in and clean up how cleave works. Can be a done a little more elegantly I think. Still have to test though.