Minor reordering

The path logic could be reused.
Edit the alternate (test) file
Get the gf mapping to work
README