Still having issues with the remove functionality but overall it works