Added basic analytics
Removed test