Merge pull request #428 from sjsrey/network

Merging into network branch.
moving analytics out of wed class and into their own module