Put back function pointers... all need to be tested...
Merge pull request #384 from Kenny9999/development

Put back function pointers... all need to be tested...