Work on the new Row Gateway class