move model stuff around