Correct pull request for functions stuff from Susannah

Delete other pull request