Almost finish CustomCommand.cpp