GH278 - Iteration 4; lock mechanism, refactor Command