much nicer now; supports a path to push upstream.