Added command structure with TODO instructions