more work on command simplification.  Will probably change to util