Command Map refactor -- in progress