Revert "Jon remove function constructor"
Merge pull request #219 from adamvr/revert-218-jon-remove-function-constructor

Revert "Jon remove function constructor"