Can't seem to stop refactoring along the way.