Update on rotation tools, this breaks a lot of functionality, but is really needed.