Getting the rest of the refactor working.