Starting to implement adding/removing commands and the like