end of q3 commit
Second Person solution working