Ben: better/more consistent file logic with notify