Issue #5 - Adds remove functionality