mid-refucktoring
huge clear out of stuff and refactoring to make thigns nicer:wq