Added some analytics stuff, and started on graph creation