First pass of prototype. Before add/delete feature