Interim Commit: hallidayResnick-2-3 refactoring ongoing - working