Fixed model dependancies & relationships
damnit
damnit2