Changes to reflect one owner and making the models suck less
Merging case