This library will not go into 0.3
Cleaned a bunch of stuff