Start adding expand feature