Finished refactor. Spindle is awesome.
implementing adapter