Merged

Input and delete fully functional
Combined our work