Split add/edit/remove  checking into their own function as per Issue #15