Work in progress
Finish tests and classes
Complete README