Assingment 6 - Added associations