Started adding functionality to compute arbitrary row structures