Functions: Do not merge

There's still work to be done, but I wanted to give you a preview.