TODOs
Doing more of the work in another thread.

Faster flow of execution on the client thread!
Comment fix
Merge branch 'development'