interim commit (mid-debug), prior to refactoring