Edit, delete and partials 
(this commit is too big)