Revert d132063..fdfe887

This rolls back to commit d1320634f707b1adc9d031794be0d7c116776485.
Edit and Add functions work again