Starting to add command support