FixingORM  Relationship Issues