Major update, way more tests
Removed crap