Remove some dependency injections; ivars now floats -- specs pass
Remove some dependency injections pt 2
Add small changes + cleanup
Rename weeks var to days for clarity
Work on empty-viewer-network counting + storage