finish fully relational rewrite for now