Even more testing
rewriting shit, possibly breaking everything
Merge crap