Begin refactor and unit tests