Finish first step of row add/remove refactor #20