Working - before refactoring and tests
Finish tests and README docs