Add and edit should be working now #224