Added and updated tables as per discussion on Monday
Added relations, one last model