Fixed some of the Interface -> Model issues!