Rework in progress
Rework passes now to see if it is set
Merge branch 'rework-filename-filepath'