Clean on arch and starting to refactor.