new branch, fixed activity indicator
Refactored polling and added observables
More refactoring
Some stuff.
fixed conflict