Working on rotation lock - the current code is not working but is also not breaking anything.
Merge branch 'RotationLock'