more work to be done...
Merge branch 'hide-path' into compile