[#26]First take at finishing the relationships between models