mostly finalized, add/del/edit working