reworked a bunch of stuff
0.2.0