store functions as option references
Merge branch 'function-options'