TEMP - part-way through drag/resize refactor