Shaping up for a new cmd thingy