Initial prototype with add/remove functionality