Lab 06_home, Stage III & further refactoring.