commit work in progress on pathfix