getting most of the working stuff and test stuf

WIP