[DO NOT MERGE] WIP - UNTESTED - first cut at commands with multiple steps