Started adding extract commands