Functions

I had to get rid of the other pull request, because it was merging to master instead of dev. Oops!