WIP - Add Locking