A refactor of stuff has been done.