update staging with changes from epoch2 #44

Closed ggrgg13 closed 6 months ago