Major refactoring of everything
New support class (to merge two objects into one pseudo-object)
Refactored model naming schemes