Updating after refactor.
Rewrite complete