Feature/roll that locking stuff back

Sadness prevails.   :(