Start of rewrite, working 'add' action.