Move calculations to model space, initial try