81ddab81 by Barry

Finished refactor and added threading for all calls.

1 parent 4264acb8