Fix the seperation of Models and Objects#17

erysdren wants to merge 18 commits intomainerysdren/plush:mainfrom

prepdataerysdren/plush:prepdataCopy head branch name to clipboard