refactor - using 'remove where i feel
add and edit functions