Updating to new command structure, adding commands