Starting to allow command infrastructure to be built