Changes made so TaskStatus can add, remove, and store Tasks easily

Reverts a revert. Consider this to be @pluxsuwong's real pull request.

@gsolbeck @Dima4ka @dcfox