v0.1 working - need a few changes in pathnames