Refactoring goal - no compile errors.  Let debugging commence