Feature/341 threading issues with async calculations

https://trello.com/c/oIMe4i0q/341-threading-issues-with-async-calculations