Added Remove functionality (in progress)