refactor, add google analytics, remove data store logic