diff --git a/apps/checkouts/__init__.py b/apps/checkouts/__init__.py
index 99fdc80c60..701f1f1914 100644
--- a/apps/checkouts/__init__.py
+++ b/apps/checkouts/__init__.py
@@ -9,7 +9,7 @@ from documents.models import Document
 from documents.permissions import PERMISSION_DOCUMENT_VIEW
 from acls.api import class_permissions
 
-from .permissions import (PERMISSION_DOCUMENT_CHECKOUT, PERMISSION_DOCUMENT_CHECKIN)
+from .permissions import (PERMISSION_DOCUMENT_CHECKOUT, PERMISSION_DOCUMENT_CHECKIN, PERMISSION_DOCUMENT_CHECKIN_OVERRIDE)
 from .links import checkout_list, checkout_document, checkout_info, checkin_document
 from .models import DocumentCheckout
 
@@ -17,18 +17,17 @@ from .models import DocumentCheckout
 def initialize_document_checkout_extra_methods():
     Document.add_to_class('is_checked_out', lambda document: DocumentCheckout.objects.is_document_checked_out(document))
     Document.add_to_class('check_in', lambda document: DocumentCheckout.objects.check_in_document(document))
+    Document.add_to_class('checkout_info', lambda document: DocumentCheckout.objects.document_checkout_info(document))
+    Document.add_to_class('checkout_state', lambda document: DocumentCheckout.objects.document_checkout_state(document))
 
-#register_multi_item_links(['folder_view'], [folder_document_multiple_remove])
-#register_links(Folder, [folder_view, folder_edit, folder_delete, folder_acl_list])
-#register_links([Folder, 'folder_list', 'folder_create'], [folder_list, folder_create], menu_name='secondary_menu')
-register_top_menu(name='checkouts', link=checkout_list)#, children_views=['folder_list', 'folder_create', 'folder_edit', 'folder_delete', 'folder_view', 'folder_document_multiple_remove'])
+register_top_menu(name='checkouts', link=checkout_list)
 register_links(Document, [checkout_info], menu_name='form_header')
-#register_sidebar_template(['folder_list'], 'folders_help.html')
 register_links(['checkout_info', 'checkout_document', 'checkin_document'], [checkout_document, checkin_document], menu_name="sidebar")
 
 class_permissions(Document, [
     PERMISSION_DOCUMENT_CHECKOUT,
     PERMISSION_DOCUMENT_CHECKIN,
+    PERMISSION_DOCUMENT_CHECKIN_OVERRIDE
 ])
 
 initialize_document_checkout_extra_methods()
@@ -37,3 +36,4 @@ initialize_document_checkout_extra_methods()
 #TODO: default checkout time
 #TODO: forcefull check in
 #TODO: specify checkout option check (document.allows_new_versions())
+#TODO: out check in after expiration datetime