fixed some problems from merge conflict last night I missed.
Moved another function to file helper.
further trying to pull out shared file code to file Helper.