Need to redo cmd structure...