stopping point mid refactor