Agreed. Refactor will have to wait until next iteration, though