continued with the refactor, and nearly finished last part of question 3.