Oop conversion model relationship

[Thomaslongwell]

refactored model and relationship to adhere to OOP will cause conflicts because of large changes to non object oriented code.