mostly worked on analytics (though not really working yet)