Progress on new cmd WIP