Finish the last refactoring so we can do insert