Initial implimentation. Buggy so far.
uncomment dispatch function
Merge branch 'develop'