todo: better command line grouping
added todos