Starting to implement more complex sub commands