start work on remove functionality