WIP: client side ...
Clean up analysis objects
Refactor to have a single network manager ...