Added locker and supporting unit tests