Finished V1, started working on tests.