diff --git a/app_setup/templates/local_settings.py.j2 b/app_setup/templates/local_settings.py.j2
index b546be54fa..e794f756b5 100644
--- a/app_setup/templates/local_settings.py.j2
+++ b/app_setup/templates/local_settings.py.j2
@@ -2,10 +2,6 @@
 
 from defaults import *
 
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
 ADMINS = (
     # ('Your Name', 'your_email@domain.com'),
 )
diff --git a/lib/api/resources/__init__.py b/lib/api/resources/__init__.py
index 606a284719..1db3b4a44e 100644
--- a/lib/api/resources/__init__.py
+++ b/lib/api/resources/__init__.py
@@ -1 +1,42 @@
-from organizations import *
+from tastypie.resources import ModelResource, ALL
+from tastypie.authentication import BasicAuthentication
+from tastypie import fields, utils
+from lib.api.auth import AcomAuthorization
+#from django.conf.urls import url
+import lib.main.models as models
+
+class Organizations(ModelResource):
+
+    class Meta:
+        # related fields...
+        queryset = models.Organization.objects.all()
+        resource_name = 'organizations'
+        authentication = BasicAuthentication()
+        authorization = AcomAuthorization()
+        #filtering = {
+        #   'projects': ALL
+        #}
+ 
+    users    = fields.ToManyField('lib.api.resources.Users', 'users', related_name='organizations', blank=True, help_text='list of all organization users')
+    admins   = fields.ToManyField('lib.api.resources.Users', 'admins', related_name='admin_of_organizations', blank=True, help_text='list of administrator users')
+    projects = fields.ToManyField('lib.api.resources.Projects', 'projects', related_name='organizations', blank=True, help_text='list of projects')
+
+class Users(ModelResource):
+
+    class Meta:
+        queryset = models.User.objects.all()
+        resource_name = 'users'
+        authentication = BasicAuthentication()
+        authorization = AcomAuthorization()
+
+class Projects(ModelResource):
+
+
+    class Meta:
+        queryset = models.Project.objects.all()
+        resource_name = 'projects'
+        authentication = BasicAuthentication()
+        authorization = AcomAuthorization()
+
+    organizations = fields.ToManyField('lib.api.resources.Organizations', 'organizations', help_text='which organizations is this project in?')
+        
diff --git a/lib/api/resources/organizations.py b/lib/api/resources/organizations.py
deleted file mode 100644
index d3a8257c5b..0000000000
--- a/lib/api/resources/organizations.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# myapp/api.py
-
-from tastypie.resources import ModelResource
-from tastypie.authentication import BasicAuthentication
-from tastypie import fields #, utils
-
-from lib.api.auth import AcomAuthorization
-from lib.api.resources.projects import Projects
-from lib.api.resources.users import Users
-
-import lib.main.models as models
-
-class Organizations(ModelResource):
-
-    users    = fields.ToManyField(Users, 'users')
-    admins   = fields.ToManyField(Users, 'admins')
-    projects = fields.ToManyField(Projects, 'projects')
-
-    class Meta:
-        queryset = models.Organization.objects.all()
-        resource_name = 'organizations'
-        authentication = BasicAuthentication()
-        authorization = AcomAuthorization()
-
-        
diff --git a/lib/api/resources/projects.py b/lib/api/resources/projects.py
deleted file mode 100644
index f550ebf7c7..0000000000
--- a/lib/api/resources/projects.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# myapp/api.py
-
-from tastypie.resources import ModelResource
-from tastypie.authentication import BasicAuthentication
-from lib.api.auth import AcomAuthorization
-import lib.main.models as models
-
-class Projects(ModelResource):
-
-    class Meta:
-        queryset = models.Project.objects.all()
-        resource_name = 'projects'
-        authentication = BasicAuthentication()
-        authorization = AcomAuthorization()
-
-        
diff --git a/lib/api/resources/users.py b/lib/api/resources/users.py
deleted file mode 100644
index b9ac621633..0000000000
--- a/lib/api/resources/users.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# myapp/api.py
-
-from tastypie.resources import ModelResource
-from tastypie.authentication import BasicAuthentication
-from lib.api.auth import AcomAuthorization
-import lib.main.models as models
-
-class Users(ModelResource):
-
-    class Meta:
-        queryset = models.User.objects.all()
-        resource_name = 'users'
-        authentication = BasicAuthentication()
-        authorization = AcomAuthorization()
-
-        
diff --git a/lib/api/urls.py b/lib/api/urls.py
index 0336a76e8a..dc727684d7 100644
--- a/lib/api/urls.py
+++ b/lib/api/urls.py
@@ -1,16 +1,13 @@
 from django.conf import settings
 from django.conf.urls import *
 from tastypie.api import Api
-from lib.api.resources import Organizations
-from lib.api.resources import Projects
-from lib.api.resources import Users
+from lib.api.resources import *
 
 v1_api = Api(api_name='v1')
 v1_api.register(Organizations())
 v1_api.register(Projects())
 v1_api.register(Users())
 
-
 urlpatterns = patterns('',
    (r'', include(v1_api.urls)),
 )
diff --git a/lib/cli/main.py b/lib/cli/main.py
index 0ce7b150f6..8ab632faf5 100644
--- a/lib/cli/main.py
+++ b/lib/cli/main.py
@@ -49,7 +49,13 @@ class Collection(object):
    def __init__(self):
 
        self.response = get(self.base_url())
-       self.data     = json.loads(self.response.text)
+       print "---"
+       print self.response.text
+       print "---"
+       try:
+           self.data     = json.loads(self.response.text)
+       except Exception, e:
+           raise e
        self.meta     = self.data['meta']
        self.objects  = self.data['objects']
        self.meta     = self.data['meta']
@@ -158,8 +164,9 @@ try:
     last_project = list(Projects())[-1]
 
     last_project.update(dict(description="new project!!!!", name="new project!!!!", organization=last_org.resource_uri))
+    print ">> it was added here: %s to %s>>" % (last_project.resource_uri, last_org.resource_uri)
     Organizations().print_display()
-   
+
     print "*** showing the orgs"
     Organizations().print_display()
 
diff --git a/lib/settings/defaults.py b/lib/settings/defaults.py
index c11f02442c..1b392558f8 100644
--- a/lib/settings/defaults.py
+++ b/lib/settings/defaults.py
@@ -13,7 +13,7 @@ for setting in dir(global_settings):
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
-DEBUG = False
+DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (