0.1.1. Clean up and add very basic tests.