Rewrite. Started work on tests.