Removing numbers on fn names, branch f

Going to try to close this PR from a git commit again, after rebasing off master, will try 'closes issue' text in merge commit