Initial work on add_command