diff --git a/.gitignore b/.gitignore
index 72364f9..def0177 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,10 @@ __pycache__/
 # C extensions
 *.so
 
+# sqlite db
+*.db
+*.sqlite
+
 # Distribution / packaging
 .Python
 env/
diff --git a/.idea/django-separate-users.iml b/.idea/django-separate-users.iml
index ae71067..9b03fd8 100644
--- a/.idea/django-separate-users.iml
+++ b/.idea/django-separate-users.iml
@@ -1,11 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PYTHON_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="django" name="Django">
+      <configuration>
+        <option name="rootFolder" value="" />
+        <option name="settingsModule" value="" />
+        <option name="manageScript" value="" />
+        <option name="environment" value="&lt;map/&gt;" />
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Python 2.7.13 virtualenv at ~/.virtualenvs/django-separate-users" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TemplatesService">
+    <option name="TEMPLATE_CONFIGURATION" value="Django" />
     <option name="TEMPLATE_FOLDERS">
       <list>
         <option value="$MODULE_DIR$/ckeditor_link/tests/test_app/templates" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index dfb77dc..97551b1 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,14 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 2.7.12+ (/usr/bin/python2.7)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 2.7.13 virtualenv at ~/.virtualenvs/django-separate-users" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2af2edf..a86d9a4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="6b538ccf-b288-49d6-9f6c-7b43088f022d" name="Default" comment="" />
+    <list default="true" id="6b538ccf-b288-49d6-9f6c-7b43088f022d" name="Default" comment="">
+      <change type="DELETED" beforePath="$PROJECT_DIR$/separate_users/tests/settings_runtestapp.py" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/separate_users/tests/test_app/fixtures/test_app.json" afterPath="" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/separate_users/tests/settings_test.py" afterPath="$PROJECT_DIR$/separate_users/tests/settings.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/django-separate-users.iml" afterPath="$PROJECT_DIR$/.idea/django-separate-users.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.txt" afterPath="$PROJECT_DIR$/CHANGELOG.txt" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/manage.py" afterPath="$PROJECT_DIR$/manage.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/separate_users/admin.py" afterPath="$PROJECT_DIR$/separate_users/admin.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/separate_users/models.py" afterPath="$PROJECT_DIR$/separate_users/models.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/separate_users/tests/test_app/admin.py" afterPath="$PROJECT_DIR$/separate_users/tests/test_app/admin.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/separate_users/tests/test_app/models.py" afterPath="$PROJECT_DIR$/separate_users/tests/test_app/models.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/separate_users/tests/test_app/views.py" afterPath="$PROJECT_DIR$/separate_users/tests/test_app/views.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/separate_users/tests/urls.py" afterPath="$PROJECT_DIR$/separate_users/tests/urls.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test_requirements.txt" afterPath="$PROJECT_DIR$/test_requirements.txt" />
+    </list>
     <ignored path="django-separate-users.iws" />
     <ignored path=".idea/workspace.xml" />
     <ignored path=".idea/dataSources.local.xml" />
@@ -15,74 +32,128 @@
   <component name="CreatePatchCommitExecutor">
     <option name="PATCH_PATH" value="" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
+  <component name="DjangoConsoleOptions" custom-start-script="import sys; print('Python %s on %s' % (sys.version, sys.platform))&#10;import django; print('Django %s' % django.get_version())&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;if 'setup' in dir(django): django.setup()&#10;import django_manage_shell; django_manage_shell.run(PROJECT_ROOT)">
+    <option name="myCustomStartScript" value="import sys; print('Python %s on %s' % (sys.version, sys.platform))&#10;import django; print('Django %s' % django.get_version())&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;if 'setup' in dir(django): django.setup()&#10;import django_manage_shell; django_manage_shell.run(PROJECT_ROOT)" />
+  </component>
   <component name="FavoritesManager">
     <favorites_list name="django-separate-users" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file leaf-file-name="models.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/separate_users/models.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+            <state relative-caret-position="450">
+              <caret line="30" column="29" lean-forward="false" selection-start-line="30" selection-start-column="29" selection-end-line="30" selection-end-column="29" />
+              <folding>
+                <element signature="e#0#32#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="0001_initial.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/separate_users/tests/test_app/migrations/0001_initial.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="585">
+              <caret line="42" column="10" lean-forward="false" selection-start-line="42" selection-start-column="10" selection-end-line="42" selection-end-column="10" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CHANGELOG.txt" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/CHANGELOG.txt">
+      <file leaf-file-name="models.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/separate_users/tests/test_app/models.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="0">
-              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="compilemessages.sh" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/compilemessages.sh">
+      <file leaf-file-name="admin.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/separate_users/tests/test_app/admin.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="0">
-              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="setup.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/setup.py">
+      <file leaf-file-name="admin.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/separate_users/admin.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="300">
-              <caret line="21" column="22" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
-              <folding />
+            <state relative-caret-position="225">
+              <caret line="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
+              <folding>
+                <element signature="e#0#32#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="manage.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/manage.py">
+      <file leaf-file-name="admin.py" pinned="false" current-in-tab="false">
+        <entry file="file://$USER_HOME$/.virtualenvs/django-separate-users/lib/python2.7/site-packages/django/contrib/auth/admin.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="150">
-              <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
-              <folding />
+            <state relative-caret-position="165">
+              <caret line="44" column="0" lean-forward="false" selection-start-line="44" selection-start-column="0" selection-end-line="45" selection-end-column="40" />
+              <folding>
+                <element signature="e#0#32#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="settings_runtestapp.py" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/separate_users/tests/settings_runtestapp.py">
+      <file leaf-file-name="apps.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/separate_users/apps.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="90">
-              <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
+            <state relative-caret-position="105">
+              <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
+              <folding>
+                <element signature="e#0#33#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="settings.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/separate_users/tests/settings.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="581">
+              <caret line="65" column="24" lean-forward="false" selection-start-line="65" selection-start-column="24" selection-end-line="65" selection-end-column="24" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="separate_users_permissions.py" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/separate_users/management/commands/separate_users_permissions.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="420">
+              <caret line="28" column="0" lean-forward="true" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
+              <folding>
+                <element signature="e#0#10#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Python Script" />
+      </list>
+    </option>
+  </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>.</find>
+    </findStrings>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -91,6 +162,20 @@
       <list>
         <option value="$PROJECT_DIR$/MANIFEST.in" />
         <option value="$PROJECT_DIR$/setup.py" />
+        <option value="$PROJECT_DIR$/CHANGELOG.txt" />
+        <option value="$PROJECT_DIR$/manage.py" />
+        <option value="$PROJECT_DIR$/separate_users/tests/test_app/models.py" />
+        <option value="$PROJECT_DIR$/separate_users/tests/test_app/views.py" />
+        <option value="$PROJECT_DIR$/separate_users/tests/test_app/admin.py" />
+        <option value="$PROJECT_DIR$/separate_users/tests/urls.py" />
+        <option value="$PROJECT_DIR$/.gitignore" />
+        <option value="$PROJECT_DIR$/test_requirements.txt" />
+        <option value="$PROJECT_DIR$/separate_users/apps.py" />
+        <option value="$PROJECT_DIR$/separate_users/admin.py" />
+        <option value="$PROJECT_DIR$/separate_users/models.py" />
+        <option value="$PROJECT_DIR$/separate_users/tests/settings.py" />
+        <option value="$PROJECT_DIR$/separate_users/management/commands/fix_separate_users_permissions.py" />
+        <option value="$PROJECT_DIR$/separate_users/management/commands/fix.py" />
       </list>
     </option>
   </component>
@@ -100,21 +185,14 @@
     <detection-done>true</detection-done>
     <sorting>DEFINITION_ORDER</sorting>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-1" />
-    <option name="y" value="-3" />
-    <option name="width" value="1442" />
-    <option name="height" value="906" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="3200" />
+    <option name="y" value="25" />
+    <option name="width" value="1248" />
+    <option name="height" value="1415" />
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
+  <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="1" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
   </component>
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1">
@@ -134,102 +212,76 @@
       <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="django-separate-users" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="django-separate-users" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="django-separate-users" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="django-separate-users" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="django-separate-users" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="separate_users" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="django-separate-users" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="django-separate-users" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="separate_users" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="tests" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="django-separate-users" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="django-separate-users" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="separate_users" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="tests" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="test_app" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="django-separate-users" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="django-separate-users" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="separate_users" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="tests" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="test_app" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="fixtures" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
+          <expand>
+            <path>
+              <item name="django-separate-users" type="b2602c69:ProjectViewProjectNode" />
+              <item name="django-separate-users" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="django-separate-users" type="b2602c69:ProjectViewProjectNode" />
+              <item name="django-separate-users" type="462c0819:PsiDirectoryNode" />
+              <item name="separate_users" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="django-separate-users" type="b2602c69:ProjectViewProjectNode" />
+              <item name="django-separate-users" type="462c0819:PsiDirectoryNode" />
+              <item name="separate_users" type="462c0819:PsiDirectoryNode" />
+              <item name="management" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="django-separate-users" type="b2602c69:ProjectViewProjectNode" />
+              <item name="django-separate-users" type="462c0819:PsiDirectoryNode" />
+              <item name="separate_users" type="462c0819:PsiDirectoryNode" />
+              <item name="management" type="462c0819:PsiDirectoryNode" />
+              <item name="commands" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="django-separate-users" type="b2602c69:ProjectViewProjectNode" />
+              <item name="django-separate-users" type="462c0819:PsiDirectoryNode" />
+              <item name="separate_users" type="462c0819:PsiDirectoryNode" />
+              <item name="tests" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="django-separate-users" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+            </path>
+            <path>
+              <item name="django-separate-users" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 2.7.13 virtualenv at ~/.virtualenvs/django-separate-users &gt;" type="70bed36:NamedLibraryElementNode" />
+            </path>
+            <path>
+              <item name="django-separate-users" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 2.7.13 virtualenv at ~/.virtualenvs/django-separate-users &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="django-separate-users" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 2.7.13 virtualenv at ~/.virtualenvs/django-separate-users &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="django" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="django-separate-users" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 2.7.13 virtualenv at ~/.virtualenvs/django-separate-users &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="django" type="462c0819:PsiDirectoryNode" />
+              <item name="contrib" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="django-separate-users" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 2.7.13 virtualenv at ~/.virtualenvs/django-separate-users &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="django" type="462c0819:PsiDirectoryNode" />
+              <item name="contrib" type="462c0819:PsiDirectoryNode" />
+              <item name="auth" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
         </subPane>
       </pane>
       <pane id="Scope" />
@@ -238,8 +290,34 @@
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="js-jscs-nodeInterpreter" value="/usr/bin/node" />
+    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
+  </component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/separate_users/management" />
+    </key>
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
   </component>
   <component name="RunManager">
+    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
+      <node-interpreter>project</node-interpreter>
+      <node-options />
+      <gulpfile />
+      <tasks />
+      <arguments />
+      <envs />
+    </configuration>
     <configuration default="true" type="DjangoTestsConfigurationType" factoryName="Django tests">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -322,9 +400,6 @@
       <module name="django-separate-users" />
       <method />
     </configuration>
-    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
-      <method />
-    </configuration>
     <configuration default="true" type="js.build_tools.npm" factoryName="npm">
       <command value="run-script" />
       <scripts />
@@ -446,6 +521,9 @@
   <component name="ShelveChangesManager" show_recycled="false">
     <option name="remove_strategy" value="false" />
   </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
       <changelist id="6b538ccf-b288-49d6-9f6c-7b43088f022d" name="Default" comment="" />
@@ -457,29 +535,33 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-1" y="-3" width="1442" height="906" extended-state="6" />
-    <editor active="false" />
+    <frame x="1919" y="-3" width="2562" height="1446" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.140625" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
   <component name="Vcs.Log.UiProperties">
     <option name="RECENTLY_FILTERED_USER_GROUPS">
       <collection />
@@ -496,18 +578,52 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/separate_users/models.py">
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.txt">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.txt">
+    <entry file="file://$PROJECT_DIR$/separate_users/models.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#32#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/compilemessages.sh">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/setup.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="300">
+          <caret line="21" column="22" lean-forward="false" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/manage.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/separate_users/tests/settings_runtestapp.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
           <folding />
         </state>
       </provider>
@@ -515,15 +631,14 @@
     <entry file="file://$PROJECT_DIR$/MANIFEST.in">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="45">
-          <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
-          <folding />
+          <caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/compilemessages.sh">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
@@ -531,15 +646,23 @@
     <entry file="file://$PROJECT_DIR$/setup.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="300">
-          <caret line="21" column="22" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
+          <caret line="21" column="22" lean-forward="false" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/manage.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
+        <state relative-caret-position="75">
+          <caret line="6" column="56" lean-forward="false" selection-start-line="6" selection-start-column="56" selection-end-line="6" selection-end-column="56" />
           <folding />
         </state>
       </provider>
@@ -547,10 +670,180 @@
     <entry file="file://$PROJECT_DIR$/separate_users/tests/settings_runtestapp.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
-          <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
+          <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/separate_users/tests/test_app/views.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/separate_users/tests/urls.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
+          <folding>
+            <element signature="e#29#70#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.virtualenvs/django-separate-users/lib/python2.7/site-packages/django/apps/config.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#9#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.virtualenvs/django-separate-users/lib/python2.7/site-packages/django/apps/registry.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#10#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/separate_users/migrations/0001_initial.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.virtualenvs/django-separate-users/lib/python2.7/site-packages/django/contrib/auth/models.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="431">
+          <caret line="235" column="35" lean-forward="false" selection-start-line="235" selection-start-column="35" selection-end-line="235" selection-end-column="35" />
+          <folding>
+            <element signature="e#0#39#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/separate_users/tests/test_app/migrations/0002_auto_20171018_0329.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.gitignore">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="375">
+          <caret line="25" column="4" lean-forward="true" selection-start-line="25" selection-start-column="4" selection-end-line="25" selection-end-column="4" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test_requirements.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/separate_users/tests/test_app/models.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/separate_users/tests/test_app/admin.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/separate_users/admin.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#32#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.virtualenvs/django-separate-users/lib/python2.7/site-packages/django/contrib/auth/admin.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="165">
+          <caret line="44" column="0" lean-forward="false" selection-start-line="44" selection-start-column="0" selection-end-line="45" selection-end-column="40" />
+          <folding>
+            <element signature="e#0#32#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/separate_users/models.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="450">
+          <caret line="30" column="29" lean-forward="false" selection-start-line="30" selection-start-column="29" selection-end-line="30" selection-end-column="29" />
+          <folding>
+            <element signature="e#0#32#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/separate_users/tests/test_app/migrations/0001_initial.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="585">
+          <caret line="42" column="10" lean-forward="false" selection-start-line="42" selection-start-column="10" selection-end-line="42" selection-end-column="10" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/separate_users/apps.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#33#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/separate_users/tests/settings.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="581">
+          <caret line="65" column="24" lean-forward="false" selection-start-line="65" selection-start-column="24" selection-end-line="65" selection-end-column="24" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/separate_users/management/commands/separate_users_permissions.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="420">
+          <caret line="28" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/separate_users/management/commands/separate_users_permissions.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="420">
+          <caret line="28" column="0" lean-forward="true" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#10#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 24def7e..3687194 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,11 +1,11 @@
 
-==== 0.xxx (not yet) ===
+==== ongoing ===
 
-- fix for djangocms-admin-styles
+- ...
 
 
-==== 0.0.1 (not yet) ===
+==== 0.0.1 ===
+
+- initial release
 
-- support for django 1.9
-- refactored tests, to use default manage.py test command
 
diff --git a/manage.py b/manage.py
index 4e42ee0..a5e9d8a 100755
--- a/manage.py
+++ b/manage.py
@@ -4,7 +4,7 @@
 
 if __name__ == "__main__":
     os.environ.setdefault('DJANGO_SETTINGS_MODULE',
-                          'separate_users.tests.settings_runtestapp')
+                          'separate_users.tests.settings')
 
     from django.core.management import execute_from_command_line
 
diff --git a/separate_users/admin.py b/separate_users/admin.py
index 451f989..1d85289 100644
--- a/separate_users/admin.py
+++ b/separate_users/admin.py
@@ -1,61 +1,31 @@
+from django.conf import settings
 from django.conf.urls import url
 from django.contrib import admin
+from django.contrib.auth import get_user_model
+from django.contrib.auth.admin import UserAdmin
 from django.db import models
 from django.http import JsonResponse
 
+from separate_users.models import FrontendUser, Editor
 
-class DjangoLinkAdmin(admin.ModelAdmin):
-
-    def get_model_perms(self, request):
-        """
-        http://stackoverflow.com/questions/2431727/django-admin-hide-a-model
-        Return empty perms dict thus hiding the model from admin index.
-        """
-        return {}
-
-    def get_urls(self):
-        """
-        add verify url.
-        """
-        my_urls = [
-            url(
-                r'^verify/$',
-                self.admin_site.admin_view(self.verify),
-                name=self._get_verify_url_name()
-            ),
-        ]
-        return my_urls + super(DjangoLinkAdmin, self).get_urls()
-
-    def _get_verify_url_name(self):
-        return '{0}_{1}_verify'.format(self.model._meta.app_label,
-                                       self.model._meta.model_name)
-
-    def verify(self, request):
-        """
-        verify data with modelform, send through data.
-        :param request:
-        :return:
-        """
-        form = self.get_form(request, )(request.POST)
-        if form.is_valid():
-            verified_data = form.cleaned_data
-            obj = self.model(**verified_data)
-            link_value = ''
-            # prepopulate href
-            if (getattr(obj, 'get_link', None)):
-                link_value = obj.get_link()
-            # basic serialize only
-            for key, value in verified_data.items():
-                if isinstance(value, models.Model):
-                    verified_data[key] = value.id
-            return_data = {"valid": 'true', 'data': verified_data, 'link_value': link_value}
-        else:
-            errors = form.errors
-            return_data = {"valid": 'false', 'errors': errors}
-        return JsonResponse(return_data)
-
-    def save_model(self, request, obj, form, change):
-        """
-        no save!
-        """
-        return False
+
+# admin.site.unregister(get_user_model())
+
+
+class FrontendUserAdmin(UserAdmin):
+    readonly_fields = ['date_joined', 'last_login', 'is_staff', 'is_superuser', 'groups', 'user_permissions', ]
+    list_filter = ['is_active', 'groups', ]
+    list_display = ['username', 'is_active', ]
+
+
+admin.site.register(FrontendUser, FrontendUserAdmin)
+
+
+class EditorAdmin(UserAdmin):
+    exclude = []
+    readonly_fields = ['date_joined', 'last_login', 'is_staff', 'is_superuser', 'user_permissions', ]
+    list_filter = ['is_active', 'groups', ]
+    list_display = ['username', 'is_active', ]
+
+
+admin.site.register(Editor, EditorAdmin)
diff --git a/separate_users/apps.py b/separate_users/apps.py
new file mode 100644
index 0000000..6e989f1
--- /dev/null
+++ b/separate_users/apps.py
@@ -0,0 +1,7 @@
+from django.apps import AppConfig
+from django.utils.translation import ugettext_lazy as _
+
+
+class SeparateUsersConfig(AppConfig):
+    name = 'separate_users'
+    verbose_name = _("Users")
diff --git a/separate_users/management/__init__.py b/separate_users/management/__init__.py
new file mode 100644
index 0000000..b8c48bd
--- /dev/null
+++ b/separate_users/management/__init__.py
@@ -0,0 +1 @@
+__author__ = 'benzkji'
diff --git a/separate_users/management/commands/__init__.py b/separate_users/management/commands/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/separate_users/management/commands/separate_users_permissions.py b/separate_users/management/commands/separate_users_permissions.py
new file mode 100644
index 0000000..640e976
--- /dev/null
+++ b/separate_users/management/commands/separate_users_permissions.py
@@ -0,0 +1,28 @@
+import sys
+
+from django.contrib.auth.management import _get_all_permissions
+from django.contrib.auth.models import Permission
+from django.contrib.contenttypes.models import ContentType
+from django.core.management.base import BaseCommand
+from django.apps import apps
+
+
+class Command(BaseCommand):
+    help = "Fix permissions for proxy models."
+
+    def handle(self, *args, **options):
+        for model in apps.get_models():
+            opts = model._meta
+            sys.stdout.write('{}-{}\n'.format(opts.app_label, opts.object_name.lower()))
+            ctype, created = ContentType.objects.get_or_create(
+                app_label=opts.app_label,
+                model=opts.object_name.lower())
+
+            for codename, name in _get_all_permissions(opts):
+                sys.stdout.write('  --{}\n'.format(codename))
+                p, created = Permission.objects.get_or_create(
+                    codename=codename,
+                    content_type=ctype,
+                    defaults={'name': name})
+                if created:
+                    sys.stdout.write('Adding permission {}\n'.format(p))
diff --git a/separate_users/models.py b/separate_users/models.py
index e69de29..67b5376 100644
--- a/separate_users/models.py
+++ b/separate_users/models.py
@@ -0,0 +1,47 @@
+from django.conf import settings
+from django.contrib.auth.models import UserManager
+from django.db import models
+from django.contrib.auth import get_user_model
+
+
+UserModel = get_user_model()
+
+
+class FrontendUserManager(UserManager):
+
+    def get_queryset(self):
+        return super(FrontendUserManager, self)\
+            .get_queryset()\
+            .filter(is_staff=False, is_superuser=False)
+
+
+class EditorManager(UserManager):
+
+    def get_queryset(self):
+        return super(EditorManager, self)\
+            .get_queryset()\
+            .filter(is_staff=True, is_superuser=False)
+
+
+class FrontendUser(UserModel):
+
+    objects = FrontendUserManager()
+
+    def save(self, *args, **kwargs):
+        self.is_staff = False
+        super(FrontendUser, self).save(*args, **kwargs)
+
+    class Meta:
+        proxy = True
+
+
+class Editor(UserModel):
+
+    objects = EditorManager()
+
+    def save(self, *args, **kwargs):
+        self.is_staff = True
+        super(Editor, self).save(*args, **kwargs)
+
+    class Meta:
+        proxy = True
\ No newline at end of file
diff --git a/separate_users/tests/settings_test.py b/separate_users/tests/settings.py
similarity index 63%
rename from separate_users/tests/settings_test.py
rename to separate_users/tests/settings.py
index e756bf0..8589268 100644
--- a/separate_users/tests/settings_test.py
+++ b/separate_users/tests/settings.py
@@ -9,48 +9,7 @@
 
 DEBUG = True
 
-logging.getLogger("factory").setLevel(logging.WARN)
-
-# from selenium.webdriver.firefox import webdriver
-from selenium.webdriver.phantomjs import webdriver
-SELENIUM_WEBDRIVER = webdriver
-
-
-separate_users_MODEL = 'separate_users.tests.test_app.models.LinkModel'
-separate_users_IFRAME_URL = reverse_lazy('admin:test_app_linkmodel_add')
-separate_users_VERIFY_URL = reverse_lazy('admin:test_app_linkmodel_verify')
-
-CKEDITOR_CONFIGS = {
-    'default': {
-        'djangolinkIframeURL': separate_users_IFRAME_URL,
-        'djangolinkVerifyURL': separate_users_VERIFY_URL,
-        'linkShowAdvancedTab': False,
-        'extraPlugins': ','.join(
-            [
-                # your extra plugins here
-                'djangolink',
-                'autolink',
-                'autoembed',
-                'embedsemantic',
-                'autogrow',
-                'devtools',
-                'widget',
-                'lineutils',
-                'clipboard',
-                'dialog',
-                'dialogui',
-                'elementspath'
-            ]),
-        'toolbar': 'Custom',
-        'toolbar_Custom': [
-            ['Bold', 'Underline'],
-            ['DjangoLink', 'Unlink'],
-            ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
-            ['Link', 'Unlink'],
-            ['RemoveFormat', 'Source']
-        ]
-    }
-}
+# logging.getLogger("factory").setLevel(logging.WARN)
 
 SITE_ID = 1
 
@@ -60,10 +19,14 @@
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': ':memory:',
+        'NAME': 'test.db',
     }
 }
 
+MIGRATION_MODULES = {
+    'separate_users': 'separate_users.tests.test_app.migrations',
+}
+
 LANGUAGE_CODE = 'en'
 LANGUAGES = (
     ('en', 'ENGLISHS' ),
@@ -93,7 +56,6 @@
 
 EXTERNAL_APPS = (
     'django.contrib.admin',
-    # 'django.contrib.admindocs',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.messages',
@@ -101,11 +63,7 @@
     'django.contrib.staticfiles',
     'django.contrib.sitemaps',
     'django.contrib.sites',
-    'ckeditor',
-    # 'djangocms_text_ckeditor',
-    # 'cms',
-    # 'treebeard',
-    # 'menus',
+    'django_extensions',
 )
 
 TEMPLATES = [
diff --git a/separate_users/tests/settings_runtestapp.py b/separate_users/tests/settings_runtestapp.py
deleted file mode 100644
index 8533e04..0000000
--- a/separate_users/tests/settings_runtestapp.py
+++ /dev/null
@@ -1,13 +0,0 @@
-"""
-These settings are used by the ``manage.py`` command.
-"""
-
-from .settings_test import *  # NOQA
-
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': 'db.sqlite',
-    }
-}
diff --git a/separate_users/tests/test_app/admin.py b/separate_users/tests/test_app/admin.py
index 7058a7d..e69de29 100644
--- a/separate_users/tests/test_app/admin.py
+++ b/separate_users/tests/test_app/admin.py
@@ -1,18 +0,0 @@
-from django import forms
-from django.contrib import admin
-from django.forms.extras.widgets import SelectDateWidget
-
-from separate_users.admin import DjangoLinkAdmin
-
-from .models import TestModel, LinkModel
-
-
-class LinkModelForm(forms.ModelForm):
-    when = forms.DateField(widget=SelectDateWidget, required=False)
-
-
-class CKLinkModelAdmin(DjangoLinkAdmin):
-    form = LinkModelForm
-
-admin.site.register(TestModel)
-admin.site.register(LinkModel, CKLinkModelAdmin)
diff --git a/separate_users/tests/test_app/fixtures/test_app.json b/separate_users/tests/test_app/fixtures/test_app.json
deleted file mode 100644
index b071f53..0000000
--- a/separate_users/tests/test_app/fixtures/test_app.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"model": "test_app.testmodel", "pk": 1, "fields": {"title": "Test 2", "richtext": "<p>None</p>", "richtext_second": ""}}, {"model": "test_app.testmodel", "pk": 2, "fields": {"title": "Testing different Link Form Widgets", "richtext": "<p>One Two <a data-ckeditor-link=\"true\" data-email=\"\" data-external_url=\"\" data-target=\"_blank\" data-when=\"2018-02-03\" href=\"http://no-link-given.com/\">Link One (Date Link, haha)</a></p>\r\n\r\n<p><a data-ckeditor-link=\"true\" data-email=\"\" data-external_url=\"\" data-target=\"\" data-testmodel=\"1\" href=\"http://no-link-given.com/\">Link Two (Foreign Key)</a></p>\r\n\r\n<p>what</p>", "richtext_second": "<p><a data-ckeditor-link=\"true\" data-email=\"\" data-external_url=\"\" data-target=\"asdvads\" data-testmodel=\"2\" href=\"http://no-link-given.com/\">sdvasdva</a>&nbsp;<a data-ckeditor-link=\"true\" data-email=\"\" data-external_url=\"sadv\" data-target=\"sdvatest\" data-testmodel=\"1\" href=\"sadv\">link</a></p>"}}]
\ No newline at end of file
diff --git a/separate_users/tests/test_app/migrations/0001_initial.py b/separate_users/tests/test_app/migrations/0001_initial.py
new file mode 100644
index 0000000..563bb62
--- /dev/null
+++ b/separate_users/tests/test_app/migrations/0001_initial.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-10-18 04:19
+from __future__ import unicode_literals
+
+from django.db import migrations
+import separate_users.models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('auth', '0008_alter_user_username_max_length'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Editor',
+            fields=[
+            ],
+            options={
+                'proxy': True,
+                'indexes': [],
+            },
+            bases=('auth.user',),
+            managers=[
+                ('objects', separate_users.models.EditorManager()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='FrontendUser',
+            fields=[
+            ],
+            options={
+                'proxy': True,
+                'indexes': [],
+            },
+            bases=('auth.user',),
+            managers=[
+                ('objects', separate_users.models.FrontendUserManager()),
+            ],
+        ),
+    ]
diff --git a/separate_users/tests/test_app/migrations/__init__.py b/separate_users/tests/test_app/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/separate_users/tests/test_app/models.py b/separate_users/tests/test_app/models.py
index f0e2bb0..e69de29 100644
--- a/separate_users/tests/test_app/models.py
+++ b/separate_users/tests/test_app/models.py
@@ -1,61 +0,0 @@
-from __future__ import unicode_literals
-
-from django.core.urlresolvers import reverse
-from django.utils.encoding import python_2_unicode_compatible
-from django.db import models
-from ckeditor.fields import RichTextField
-# from djangocms_text_ckeditor.fields import HTMLField
-
-
-@python_2_unicode_compatible
-class TestModel(models.Model):
-    title = models.CharField(max_length=255, )
-    richtext = RichTextField(default='')
-    richtext_second = RichTextField(default='')
-
-    def __str__(self):
-        return "%s" % self.title
-
-    def get_absolute_url(self):
-        return reverse('testmodel_detail', args=(self.id, ))
-
-
-# @python_2_unicode_compatible
-# class CMSTestModel(models.Model):
-#     title = models.CharField(max_length=255, )
-#     richtext = HTMLField()
-#
-#     def __str__(self):
-#         return "%s" % self.title
-
-
-@python_2_unicode_compatible
-class LinkModelBase(models.Model):
-    target = models.CharField(max_length=255, blank=True, default='', )
-    external_url = models.CharField(max_length=255, blank=True, default='',)
-    email = models.EmailField(blank=True, default='',)
-    # http://stackoverflow.com/questions/12644142/prefill-a-datetimefield-from-url-in-django-admin
-    when = models.DateField(blank=True, null=True)
-    testmodel = models.ForeignKey(TestModel, null=True, default=None, blank=True)
-
-    class Meta:
-        abstract = True
-
-    def __str__(self):
-        return "LINK object: %s" % self.get_link()
-
-    def get_link(self):
-        if self.external_url:
-            return self.external_url
-        else:
-            return "http://no-link-given.com/"
-
-    def get_target(self):
-        return "_blank"
-
-    def get_css_class(self):
-        return "no-css-class"
-
-
-class LinkModel(LinkModelBase):
-    pass
diff --git a/separate_users/tests/test_app/views.py b/separate_users/tests/test_app/views.py
index 526428d..e69de29 100644
--- a/separate_users/tests/test_app/views.py
+++ b/separate_users/tests/test_app/views.py
@@ -1,7 +0,0 @@
-from django.views.generic import DetailView
-
-from .models import TestModel
-
-
-class TestModelDetailView(DetailView):
-    model = TestModel
diff --git a/separate_users/tests/urls.py b/separate_users/tests/urls.py
index 29d540d..1a1c868 100644
--- a/separate_users/tests/urls.py
+++ b/separate_users/tests/urls.py
@@ -1,17 +1,8 @@
 """URLs to run the tests."""
-from django.conf import settings
 from django.conf.urls import include, url
 from django.contrib import admin
 
-from test_app.views import TestModelDetailView
-
 
 urlpatterns = [
     url(r'^admin/', include(admin.site.urls)),
-    url(r'^testmodel/(?P<pk>\d+)/$', TestModelDetailView.as_view(), name='testmodel_detail'),
 ]
-
-# if settings.DEBUG:
-#     urlpatterns += [
-#         url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),
-#     ]
diff --git a/test_requirements.txt b/test_requirements.txt
index 7602156..e9747d2 100644
--- a/test_requirements.txt
+++ b/test_requirements.txt
@@ -3,12 +3,8 @@ tox
 coverage
 django-coverage
 flake8
-factory_boy
-mock
-selenium
+# factory_boy
+# mock
+# selenium
 
-django==1.9
-django-ckeditor==5.1.1
-
-lxml
-cssselect
\ No newline at end of file
+django==1.11