Finished move, now starting on refactor.