More function stuff
Revert "More function stuff"

This reverts commit 3d06fe7aef72a5285f1ac6baf8d1a815b9bab61f.
git why didn't you take this with you
Revert "Revert "More function stuff""

This reverts commit 06df98b259821b6687b26a71192e6b22d35d1d20.