Big move to get add / delete / modify / duplicate working
Signed-off-by: thenderson <todd.hndrsn@gmail.com>