Adding more flesh to Models
Sorted out a few relationships