moved object to model -- very hacky mod.