Develop

Switched to Dispatch and all functionality working