New command flow in views.py
merge conflicts in analytics