2176: Working on lock / idling functionality in the new editor.