diff --git a/openstack_auth/views.py b/openstack_auth/views.py
index 7dcfc5eee2..a9a391fe50 100644
--- a/openstack_auth/views.py
+++ b/openstack_auth/views.py
@@ -50,6 +50,7 @@ except AttributeError:
 LOG = logging.getLogger(__name__)
 
 
+# TODO(stephenfin): Migrate to CBV
 @sensitive_post_parameters()
 @csrf_protect
 @never_cache
@@ -152,6 +153,7 @@ def login(request):
     return res
 
 
+# TODO(stephenfin): Migrate to CBV
 @sensitive_post_parameters()
 @csrf_exempt
 @never_cache
@@ -179,6 +181,7 @@ def websso(request):
     return django_http.HttpResponseRedirect(settings.LOGIN_REDIRECT_URL)
 
 
+# TODO(stephenfin): Migrate to CBV
 def logout(request, login_url=None, **kwargs):
     """Logs out the user if he is logged in. Then redirects to the log-in page.
 
@@ -205,6 +208,7 @@ def logout(request, login_url=None, **kwargs):
                                                    **kwargs)
 
 
+# TODO(stephenfin): Migrate to CBV
 @login_required
 def switch(request, tenant_id, redirect_field_name=auth.REDIRECT_FIELD_NAME):
     """Switches an authenticated user from one project to another."""
@@ -256,6 +260,7 @@ def switch(request, tenant_id, redirect_field_name=auth.REDIRECT_FIELD_NAME):
     return response
 
 
+# TODO(stephenfin): Migrate to CBV
 @login_required
 def switch_region(request, region_name,
                   redirect_field_name=auth.REDIRECT_FIELD_NAME):
@@ -279,6 +284,7 @@ def switch_region(request, region_name,
     return response
 
 
+# TODO(stephenfin): Migrate to CBV
 @login_required
 def switch_keystone_provider(request, keystone_provider=None,
                              redirect_field_name=auth.REDIRECT_FIELD_NAME):
diff --git a/openstack_dashboard/dashboards/project/api_access/views.py b/openstack_dashboard/dashboards/project/api_access/views.py
index eae441d9c4..b53db68244 100644
--- a/openstack_dashboard/dashboards/project/api_access/views.py
+++ b/openstack_dashboard/dashboards/project/api_access/views.py
@@ -86,6 +86,7 @@ def _get_openrc_credentials(request):
     }
 
 
+# TODO(stephenfin): Migrate to CBV
 def download_ec2_bundle(request):
     tenant_name = request.user.tenant_name
 
@@ -118,6 +119,7 @@ def download_ec2_bundle(request):
     return response
 
 
+# TODO(stephenfin): Migrate to CBV
 def download_rc_file(request):
     template = settings.OPENRC_CUSTOM_TEMPLATE
 
@@ -137,6 +139,7 @@ def download_rc_file(request):
     return _download_rc_file_for_template(request, context, template)
 
 
+# TODO(stephenfin): Migrate to CBV
 def download_clouds_yaml_file(request):
     template = settings.OPENSTACK_CLOUDS_YAML_CUSTOM_TEMPLATE
 
diff --git a/openstack_dashboard/dashboards/project/instances/views.py b/openstack_dashboard/dashboards/project/instances/views.py
index df00241ea5..c8634b154b 100644
--- a/openstack_dashboard/dashboards/project/instances/views.py
+++ b/openstack_dashboard/dashboards/project/instances/views.py
@@ -271,6 +271,7 @@ class LaunchInstanceView(workflows.WorkflowView):
         return initial
 
 
+# TODO(stephenfin): Migrate to CBV
 def console(request, instance_id):
     data = _('Unable to get log for instance "%s".') % instance_id
     tail = request.GET.get('length')
@@ -287,6 +288,7 @@ def console(request, instance_id):
     return http.HttpResponse(data.encode('utf-8'), content_type='text/plain')
 
 
+# TODO(stephenfin): Migrate to CBV
 def auto_console(request, instance_id):
     console_type = settings.CONSOLE_TYPE
     try:
@@ -300,6 +302,7 @@ def auto_console(request, instance_id):
         exceptions.handle(request, msg, redirect=redirect)
 
 
+# TODO(stephenfin): Migrate to CBV
 def vnc(request, instance_id):
     try:
         instance = api.nova.server_get(request, instance_id)
@@ -311,6 +314,7 @@ def vnc(request, instance_id):
         exceptions.handle(request, msg, redirect=redirect)
 
 
+# TODO(stephenfin): Migrate to CBV
 def mks(request, instance_id):
     try:
         instance = api.nova.server_get(request, instance_id)
@@ -322,6 +326,7 @@ def mks(request, instance_id):
         exceptions.handle(request, msg, redirect=redirect)
 
 
+# TODO(stephenfin): Migrate to CBV
 def spice(request, instance_id):
     try:
         instance = api.nova.server_get(request, instance_id)
@@ -334,6 +339,7 @@ def spice(request, instance_id):
         exceptions.handle(request, msg, redirect=redirect)
 
 
+# TODO(stephenfin): Migrate to CBV
 def rdp(request, instance_id):
     try:
         instance = api.nova.server_get(request, instance_id)
diff --git a/openstack_dashboard/views.py b/openstack_dashboard/views.py
index fed92528c6..39e462d3bb 100644
--- a/openstack_dashboard/views.py
+++ b/openstack_dashboard/views.py
@@ -40,6 +40,7 @@ def get_user_home(user):
     return dashboard.get_absolute_url()
 
 
+# TODO(stephenfin): Migrate to CBV
 @django.views.decorators.vary.vary_on_cookie
 def splash(request):
     if not request.user.is_authenticated: