Locker overhaul