Add TODO for locking