Added TODOs in views.py