added add/remove functionality => still need to add type filter