diff --git a/.gitignore b/.gitignore
index 269c735..f0c73ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@
 MANIFEST
 docs/_build
 dist/
+build/
 *egg-info
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..44333a8
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,7 @@
+language: python
+python:
+  - "2.6"
+  - "2.7"
+install:
+  - pip install -r requirements/dev.txt --use-mirrors
+script: nosetests
diff --git a/AUTHORS.rst b/AUTHORS.rst
index 3497c25..9a5f5e1 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -1,4 +1,5 @@
 python-github3 is written and maintained by **David Medina** and
+
 various contributors:
 
 Development Lead
@@ -24,3 +25,11 @@ Patches and Suggestions
 - Francisco Marcos <fmarcos83@gmail.com>
 - Nathaniel Williams <nat.williams@gmail.com>
 - Alejandro Gómez <alejandroogomez@gmail.com>
+- Stefano Rivera <stefano@rivera.za.net>
+- Ouertani Mohammed Amine <tsl.hacker@gmail.com>
+- Conor Branagan <conor.branagan@gmail.com>
+- Ralph Bean <rbean@redhat.com>
+- Jason A. Donenfeld <Jason@zx2c4.com>
+- Brad Montgomery <http://about.me/bkmontgomery>
+- Thomas Whitton <mail@thomaswhitton.com>
+- Jonas Baumann <https://github.com/jone>
diff --git a/MANIFEST.in b/MANIFEST.in
index 93f4e76..072beda 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
 include AUTHORS.rst
 include README.rst
 include LICENSE
-include requirements.txt
+include requirements/base.txt
diff --git a/README.rst b/README.rst
index d7fa447..dc80034 100644
--- a/README.rst
+++ b/README.rst
@@ -1,3 +1,5 @@
+.. image:: https://secure.travis-ci.org/copitux/python-github3.png
+
 Pygithub3
 ==========
 
@@ -43,11 +45,13 @@ Achievements
 - `Gists service <http://developer.github.com/v3/gists/>`_
 - `Git Data service <http://developer.github.com/v3/git/>`_
 - `Pull requests service <http://developer.github.com/v3/pulls/>`_
+- `Orgs service <http://developer.github.com/v3/orgs/>`_
+- `Issues service <http://developer.github.com/v3/issues/>`_
+- `Events service <http://developer.github.com/v3/events/>`_
 
 TODO
 -----
 
-- Services: Issues, Orgs, Events
 - Oauth authorization API (service?)
 - Proxy methods into resources (e.g copitux.followers)
 
diff --git a/docs/events.rst b/docs/events.rst
new file mode 100644
index 0000000..49d0de5
--- /dev/null
+++ b/docs/events.rst
@@ -0,0 +1,150 @@
+.. _Events service:
+
+Events service
+==============
+
+This service exposes the `Events API`_. Much of this API is read-only, and while
+pagination is supported, there is a fixed page size of 30 with a limit of 10
+page requests.
+
+Many events have an `actor` which denotes the user that performed an event.
+Additionally, there may be `org` or `repo` attributes for events related to
+Organizations and Repos. Finally, each event object contains a `payload`
+attribute containing more detailed information about the event.
+
+.. _public events:
+
+Public Events
+-------------
+Yields the most recent public events from Github.
+
+::
+
+    from pygithub3 import Github
+
+    gh = Github()
+
+    events = gh.events.list().all()
+    print events[0].payload
+
+Event
+.......
+
+.. autoclass:: pygithub3.services.events.Event
+    :members:
+
+    .. attribute:: issues
+
+        :ref:`Issues events <Issues events service>`
+
+    .. attribute:: networks
+
+        :ref:`Events network service`
+
+    .. attribute:: orgs
+
+        :ref:`Events org service`
+
+    .. attribute:: repos
+
+        :ref:`Events repo service`
+
+    .. attribute:: users
+
+        :ref:`Events user service`
+
+.. _repository events:
+
+Repo Events
+-----------
+
+These are events for a specific repo, including issue and network events. The
+Issues events are proxied to the :ref:`Issues service`.
+
+::
+
+    events = gh.events.repos.list(user="copitux", repo="python-github3")
+    for e in events.next():
+        print("{t}".format(t=e.type))
+
+    # Get the issue Events
+    events = gh.events.issues.list_by_repo(user="copitux",
+                                           repo="python-github3")
+
+    # Get the Public Events for a Repo's Network
+    events = gh.events.networks.list(user="copitux", repo="python-github3")
+
+.. _Events network service:
+
+Network
+.......
+
+.. autoclass:: pygithub3.services.events.networks.Network
+    :members:
+
+
+.. _Events repo service:
+
+Repo
+........
+
+.. autoclass:: pygithub3.services.events.repos.Repo
+    :members:
+
+
+.. _organziation events:
+
+Organization Events
+-------------------
+
+These are the public events for an Organization
+
+::
+
+    events = gh.events.orgs.list(org="Acme")
+
+You may also get a user's feed of events for an Organization, but you *must* be
+authenticated as the provided user, and you must be a member of the given
+organization.
+
+::
+
+    events = gh.events.users.orgs(user="copitux", org="acme")
+
+.. _Events org service:
+
+Org
+........
+
+.. autoclass:: pygithub3.services.events.orgs.Org
+    :members:
+
+.. _user events:
+
+User Events
+-----------
+
+You can retrieve the public events performed by a user and the public events
+that a user receives. If you're authenticated, you may also receive private
+events.
+
+::
+
+    received_events = gh.events.users.list_received_public(user="copitux")
+    performed_events = gh.events.users.list_performed_public(user="copitux")
+
+If authenticated as `copitux`, you could get private events with the
+following, otherwise you'll just get the public events as above:
+
+::
+
+    received_events = gh.events.users.list_received(user="copitux")
+    performed_events = gh.events.users.list_performed(user="copitux")
+
+.. _Events user service:
+
+User
+........
+
+.. autoclass:: pygithub3.services.events.users.User
+    :members:
diff --git a/docs/issues.rst b/docs/issues.rst
new file mode 100644
index 0000000..3c35eb8
--- /dev/null
+++ b/docs/issues.rst
@@ -0,0 +1,74 @@
+.. _Issues service:
+
+Issues services
+===============
+
+**Fast sample**::
+
+    from pygithub3 import Github
+
+    auth = dict(login='octocat', password='pass')
+    gh = Github(**auth)
+
+    octocat_issues = gh.issues.list()
+    octocat_repo_issues = gh.issues.list_by_repo('octocat', 'Hello-World')
+
+Issues
+------
+
+.. autoclass:: pygithub3.services.issues.Issue
+    :members:
+
+    .. attribute:: comments
+
+        :ref:`Issues comments service`
+
+    .. attribute:: events
+
+        :ref:`Issues events service`
+
+    .. attribute:: labels
+
+        :ref:`Labels service`
+
+    .. attribute:: milestones
+
+        :ref:`Milestones service`
+
+.. _Issues comments service:
+
+Comments
+--------
+
+.. autoclass:: pygithub3.services.issues.Comments
+    :members:
+
+.. _Issues events service:
+
+Events
+------
+
+.. autoclass:: pygithub3.services.issues.Events
+    :members:
+
+.. _Labels service:
+
+Labels
+------
+
+.. autoclass:: pygithub3.services.issues.Labels
+    :members:
+
+.. _Milestones service:
+
+Milestones
+----------
+
+.. autoclass:: pygithub3.services.issues.Milestones
+    :members:
+
+.. _github issues doc: http://developer.github.com/v3/issues
+.. _github comments doc: http://developer.github.com/v3/issues/comments
+.. _github events doc: http://developer.github.com/v3/issues/events
+.. _github labels doc: http://developer.github.com/v3/issues/labels
+.. _github milestones doc: http://developer.github.com/v3/issues/milestones
diff --git a/docs/orgs.rst b/docs/orgs.rst
new file mode 100644
index 0000000..96e7a73
--- /dev/null
+++ b/docs/orgs.rst
@@ -0,0 +1,46 @@
+.. _Orgs service:
+
+Orgs services
+==============
+
+**Fast sample**::
+
+    from pygithub3 import Github
+
+    gh = Github(token='abc123')
+
+    auth_orgs = gh.orgs.list().all()
+    members = gh.orgs.members.list('github')
+
+Org
+------
+
+.. autoclass:: pygithub3.services.orgs.Org
+    :members:
+
+    .. attribute:: members
+
+        :ref:`Members service`
+
+    .. attribute:: teams
+
+        :ref:`Teams service`
+
+.. _Members service:
+
+Members
+---------
+
+.. autoclass:: pygithub3.services.orgs.members.Members
+    :members:
+
+.. _Teams service:
+
+Teams
+-------
+
+.. autoclass:: pygithub3.services.orgs.teams.Teams
+    :members:
+
+.. _github orgs doc: http://developer.github.com/v3/orgs
+.. _github orgs teams doc: http://developer.github.com/v3/orgs/teams
diff --git a/docs/repos.rst b/docs/repos.rst
index c065671..9832f3d 100644
--- a/docs/repos.rst
+++ b/docs/repos.rst
@@ -128,6 +128,14 @@ Watchers
 .. autoclass:: pygithub3.services.repos.Watchers
     :members:
 
+.. _Stargazers service:
+
+Stargazers
+---------
+
+.. autoclass:: pygithub3.services.repos.Stargazers
+    :members:
+
 .. _Hooks service:
 
 Hooks
@@ -136,6 +144,12 @@ Hooks
 .. autoclass:: pygithub3.services.repos.Hooks
     :members:
 
+Statuses
+---------
+
+.. autoclass:: pygithub3.services.repos.Statuses
+    :members:
+
 .. _github repos doc: http://developer.github.com/v3/repos
 .. _github collaborators doc: http://developer.github.com/v3/repos/collaborators
 .. _github commits doc: http://developer.github.com/v3/repos/commits
@@ -144,3 +158,4 @@ Hooks
 .. _github keys doc: http://developer.github.com/v3/repos/keys
 .. _github watching doc: http://developer.github.com/v3/repos/watching
 .. _github hooks doc: http://developer.github.com/v3/repos/hooks
+.. _github statuses doc: http://developer.github.com/v3/repos/statuses
diff --git a/docs/services.rst b/docs/services.rst
index 190ae99..998fb7e 100644
--- a/docs/services.rst
+++ b/docs/services.rst
@@ -74,5 +74,8 @@ List of services
     gists
     git_data
     pull_requests
+    orgs
+    issues
+    events
 
 .. _mimetypes: http://developer.github.com/v3/mime
diff --git a/pygithub3/__init__.py b/pygithub3/__init__.py
index 9a626f3..461dabe 100644
--- a/pygithub3/__init__.py
+++ b/pygithub3/__init__.py
@@ -1,8 +1,7 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
 __title__ = 'pygithub3'
-__version__ = '0.3'
+__version__ = '0.5'
 __author__ = 'David Medina'
 __email__ = 'davidmedina9@gmail.com'
 __license__ = 'ISC'
diff --git a/pygithub3/core/client.py b/pygithub3/core/client.py
index ee7c97f..d4b8cd5 100644
--- a/pygithub3/core/client.py
+++ b/pygithub3/core/client.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
 import requests
@@ -25,6 +24,8 @@ def __init__(self, **kwargs):
         self.config.update(kwargs)
         self.set_credentials(self.config.get('login'),
                              self.config.get('password'))
+        self.set_oauth_credentials(self.config.get('client_id'),
+                             self.config.get('client_secret'))
         self.set_token(self.config.get('token'))
         self.__set_params(self.config)
 
@@ -48,14 +49,22 @@ def set_credentials(self, login, password):
         if login and password:
             self.requester.auth = (login, password)
 
+    def set_oauth_credentials(self, client_id, client_secret):
+        if client_id and client_secret:
+            self.requester.params.append(('client_id', client_id))
+            self.requester.params.append(('client_secret', client_secret))
+
     def set_token(self, token):
         if token:
-            self.requester.params['access_token'] = token
+            self.requester.params.append(('access_token', token))
 
     def __set_params(self, config):
-        self.requester.params['per_page'] = config.get('per_page')
+        per_page = ('per_page', config.get('per_page'))
+        self.requester.params.append(per_page)
         if config.get('verbose'):
             self.requester.config = {'verbose': config['verbose']}
+        if config.get('timeout'):
+            self.requester.timeout = config['timeout']
 
     def __parse_kwargs(func):
         """ Decorator to put extra args into requests.params """
diff --git a/pygithub3/core/utils.py b/pygithub3/core/compat.py
similarity index 97%
rename from pygithub3/core/utils.py
rename to pygithub3/core/compat.py
index 24a3bbf..c6dbf0a 100644
--- a/pygithub3/core/utils.py
+++ b/pygithub3/core/compat.py
@@ -2,11 +2,6 @@
 # -*- encoding: utf-8 -*-
 """ Utils to support python 2.6 compatibility """
 
-try:
-    import simplejson as json
-except ImportError:
-    import json
-
 from collections import MutableMapping
 
 
diff --git a/pygithub3/core/errors.py b/pygithub3/core/errors.py
index 9b84479..d86b2dd 100644
--- a/pygithub3/core/errors.py
+++ b/pygithub3/core/errors.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from pygithub3.core.utils import json
+from pygithub3.core import json
 from pygithub3.exceptions import NotFound, BadRequest, UnprocessableEntity
 
 
diff --git a/pygithub3/core/json/__init__.py b/pygithub3/core/json/__init__.py
new file mode 100644
index 0000000..f0adb20
--- /dev/null
+++ b/pygithub3/core/json/__init__.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+"""
+Emulate json module with encode/decoders to support github datetime format
+"""
+
+from datetime import datetime
+try:
+    import simplejson as json
+except ImportError:
+    import json
+
+GITHUB_DATE_FORMAT = '%Y-%m-%dT%H:%M:%SZ'
+
+
+class GHJSONEncoder(json.JSONEncoder):
+    def default(self, o):
+        try:
+            return datetime.strftime(o, GITHUB_DATE_FORMAT)
+        except:
+            return super(GHJSONEncoder, self).default(o)
+
+
+def gh_decoder_hook(dict_):
+    for k, v in dict_.iteritems():
+        try:
+            date = datetime.strptime(v, GITHUB_DATE_FORMAT)
+            dict_[k] = date
+        except:
+            continue
+    return dict_
+
+
+def dumps(obj, cls=GHJSONEncoder, **kwargs):
+    return json.dumps(obj, cls=cls, **kwargs)
+
+
+def loads(s, object_hook=gh_decoder_hook, **kwargs):
+    return json.loads(s, object_hook=object_hook, **kwargs)
+
+dump = json.dump
+load = json.load
diff --git a/pygithub3/github.py b/pygithub3/github.py
index 87c4a6d..d64577c 100644
--- a/pygithub3/github.py
+++ b/pygithub3/github.py
@@ -17,13 +17,19 @@ def __init__(self, **config):
         from pygithub3.services.users import User
         from pygithub3.services.repos import Repo
         from pygithub3.services.gists import Gist
+        from pygithub3.services.events import Event
         from pygithub3.services.git_data import GitData
         from pygithub3.services.pull_requests import PullRequests
+        from pygithub3.services.orgs import Org
+        from pygithub3.services.issues import Issue
         self._users = User(**config)
         self._repos = Repo(**config)
         self._gists = Gist(**config)
         self._git_data = GitData(**config)
         self._pull_requests = PullRequests(**config)
+        self._orgs = Org(**config)
+        self._issues = Issue(**config)
+        self._events = Event(**config)
 
     @property
     def remaining_requests(self):
@@ -65,3 +71,24 @@ def pull_requests(self):
         :ref:`Pull Requests service <Pull Requests service>`
         """
         return self._pull_requests
+
+    @property
+    def orgs(self):
+        """
+        :ref:`Orgs service <Orgs service>`
+        """
+        return self._orgs
+
+    @property
+    def issues(self):
+        """
+        :ref:`Issues service <Issues service>`
+        """
+        return self._issues
+
+    @property
+    def events(self):
+        """
+        :ref:`Events service <Events service>`
+        """
+        return self._events
diff --git a/pygithub3/requests/base.py b/pygithub3/requests/base.py
index c4fe5cc..7eb0ff3 100644
--- a/pygithub3/requests/base.py
+++ b/pygithub3/requests/base.py
@@ -1,9 +1,9 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
 import re
 
-from pygithub3.core.utils import import_module, json
+from pygithub3.core import json
+from pygithub3.core.compat import import_module
 from pygithub3.exceptions import (RequestDoesNotExist, UriInvalid,
                                   ValidationError, InvalidBodySchema)
 from pygithub3.resources.base import Raw
@@ -27,8 +27,8 @@ def dumps(self):
     def parse(self):
         """ Parse body with schema-required rules """
         if not hasattr(self.content, 'items'):
-            raise ValidationError("'%s' needs a content dictionary"
-                                   % self.__class__.__name__)
+            raise ValidationError("It needs a content dictionary (%s)" % (
+                self.content, ))
         parsed = dict([(key, self.content[key]) for key in self.schema
                       if key in self.content])
         for attr_required in self.required:
diff --git a/pygithub3/requests/events/__init__.py b/pygithub3/requests/events/__init__.py
new file mode 100644
index 0000000..fd4988f
--- /dev/null
+++ b/pygithub3/requests/events/__init__.py
@@ -0,0 +1,10 @@
+# -*- encoding: utf-8 -*-
+
+from pygithub3.requests.base import Request
+from pygithub3.resources.events import Event
+
+
+class List(Request):
+
+    uri = 'events'
+    resource = Event
diff --git a/pygithub3/requests/events/networks.py b/pygithub3/requests/events/networks.py
new file mode 100644
index 0000000..e510773
--- /dev/null
+++ b/pygithub3/requests/events/networks.py
@@ -0,0 +1,10 @@
+# -*- encoding: utf-8 -*-
+
+from . import Request
+from pygithub3.resources.events import Network
+
+
+class List(Request):
+
+    uri = 'networks/{user}/{repo}/events'
+    resource = Network
diff --git a/pygithub3/requests/events/orgs.py b/pygithub3/requests/events/orgs.py
new file mode 100644
index 0000000..c8e9fc7
--- /dev/null
+++ b/pygithub3/requests/events/orgs.py
@@ -0,0 +1,10 @@
+# -*- encoding: utf-8 -*-
+
+from . import Request
+from pygithub3.resources.events import Org
+
+
+class List(Request):
+
+    uri = 'orgs/{org}/events'
+    resource = Org
diff --git a/pygithub3/requests/events/repos.py b/pygithub3/requests/events/repos.py
new file mode 100644
index 0000000..6bb2f98
--- /dev/null
+++ b/pygithub3/requests/events/repos.py
@@ -0,0 +1,10 @@
+# -*- encoding: utf-8 -*-
+
+from . import Request
+from pygithub3.resources.events import Repo
+
+
+class List(Request):
+
+    uri = 'repos/{user}/{repo}/events'
+    resource = Repo
diff --git a/pygithub3/requests/events/users.py b/pygithub3/requests/events/users.py
new file mode 100644
index 0000000..a8556ae
--- /dev/null
+++ b/pygithub3/requests/events/users.py
@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+
+from . import Request
+from pygithub3.resources.events import User, Org
+
+
+class List_received(Request):
+
+    uri = 'users/{user}/received_events'
+    resource = User
+
+
+class List_received_public(Request):
+
+    uri = 'users/{user}/received_events/public'
+    resource = User
+
+
+class List_performed(Request):
+
+    uri = 'users/{user}/events'
+    resource = User
+
+
+class List_performed_public(Request):
+
+    uri = 'users/{user}/events/public'
+    resource = User
+
+
+class List_org_events(Request):
+
+    uri = 'users/{user}/events/orgs/{org}'
+    resource = Org
diff --git a/pygithub3/requests/gists/__init__.py b/pygithub3/requests/gists/__init__.py
index 4dbc6e6..a8d92b7 100644
--- a/pygithub3/requests/gists/__init__.py
+++ b/pygithub3/requests/gists/__init__.py
@@ -1,8 +1,9 @@
 # -*- encoding: utf-8 -*-
 
-from pygithub3.requests.base import Request, ValidationError
+from pygithub3.requests.base import Request
 from pygithub3.resources.gists import Gist
 
+
 class List(Request):
 
     uri = 'users/{user}/gists'
diff --git a/pygithub3/requests/gists/comments.py b/pygithub3/requests/gists/comments.py
index 8e5af15..1da78cb 100644
--- a/pygithub3/requests/gists/comments.py
+++ b/pygithub3/requests/gists/comments.py
@@ -3,6 +3,7 @@
 from pygithub3.requests.base import Request
 from pygithub3.resources.gists import Comment
 
+
 class List(Request):
 
     uri = 'gists/{gist_id}/comments'
diff --git a/pygithub3/requests/git_data/references.py b/pygithub3/requests/git_data/references.py
index 2aac6a4..9824bdb 100644
--- a/pygithub3/requests/git_data/references.py
+++ b/pygithub3/requests/git_data/references.py
@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 from pygithub3.requests.base import Request
 from pygithub3.resources.git_data import Reference
 
@@ -20,6 +22,7 @@ class Create(Request):
         'required': ('ref', 'sha'),
     }
 
+
 class Update(Request):
     uri = 'repos/{user}/{repo}/git/refs/{ref}'
     resource = Reference
diff --git a/pygithub3/requests/git_data/tags.py b/pygithub3/requests/git_data/tags.py
index dbc8da4..88a79c0 100644
--- a/pygithub3/requests/git_data/tags.py
+++ b/pygithub3/requests/git_data/tags.py
@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 from pygithub3.requests.base import Request
 from pygithub3.resources.git_data import Tag
 
@@ -6,6 +8,7 @@ class Get(Request):
     uri = 'repos/{user}/{repo}/git/tags/{sha}'
     resource = Tag
 
+
 class Create(Request):
     uri = 'repos/{user}/{repo}/git/tags'
     resource = Tag
diff --git a/pygithub3/requests/issues/__init__.py b/pygithub3/requests/issues/__init__.py
new file mode 100644
index 0000000..d6c7b06
--- /dev/null
+++ b/pygithub3/requests/issues/__init__.py
@@ -0,0 +1,44 @@
+#!/usr/bin/env python
+# -*- encoding: utf-8 -*-
+
+from pygithub3.requests.base import Request
+from pygithub3.resources.issues import Issue
+
+
+class List(Request):
+
+    uri = 'issues'
+    resource = Issue
+
+
+class List_by_repo(Request):
+
+    uri = 'repos/{user}/{repo}/issues'
+    resource = Issue
+
+
+class Get(Request):
+
+    uri = 'repos/{user}/{repo}/issues/{number}'
+    resource = Issue
+
+
+class Create(Request):
+
+    uri = 'repos/{user}/{repo}/issues'
+    resource = Issue
+    body_schema = {
+        'schema': ('title', 'body', 'assignee', 'milestone', 'labels'),
+        'required': ('title', )
+    }
+
+
+class Update(Request):
+
+    uri = 'repos/{user}/{repo}/issues/{number}'
+    resource = Issue
+    body_schema = {
+        'schema': ('title', 'body', 'assignee', 'state', 'milestone',
+                   'lables'),
+        'required': ()
+    }
diff --git a/pygithub3/requests/issues/comments.py b/pygithub3/requests/issues/comments.py
new file mode 100644
index 0000000..c9618a8
--- /dev/null
+++ b/pygithub3/requests/issues/comments.py
@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+
+from pygithub3.requests.base import Request
+from pygithub3.resources.issues import Comment
+
+
+class List(Request):
+
+    uri = 'repos/{user}/{repo}/issues/{number}/comments'
+    resource = Comment
+
+
+class Get(Request):
+
+    uri = 'repos/{user}/{repo}/issues/comments/{id}'
+    resource = Comment
+
+
+class Create(Request):
+
+    uri = 'repos/{user}/{repo}/issues/{number}/comments'
+    resource = Comment
+    body_schema = {
+        'schema': ('body', ),
+        'required': ('body', )
+    }
+
+
+class Edit(Request):
+
+    uri = 'repos/{user}/{repo}/issues/comments/{id}'
+    resource = Comment
+    body_schema = {
+        'schema': ('body', ),
+        'required': ('body', )
+    }
+
+
+class Delete(Request):
+
+    uri = 'repos/{user}/{repo}/issues/comments/{id}'
+    resource = Comment
diff --git a/pygithub3/requests/issues/events.py b/pygithub3/requests/issues/events.py
new file mode 100644
index 0000000..d284681
--- /dev/null
+++ b/pygithub3/requests/issues/events.py
@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+
+from pygithub3.requests.base import Request
+from pygithub3.resources.issues import Event
+
+
+class List_by_issue(Request):
+
+    uri = 'repos/{user}/{repo}/issues/{number}/events'
+    resource = Event
+
+
+class List_by_repo(Request):
+
+    uri = 'repos/{user}/{repo}/issues/events'
+    resource = Event
+
+
+class Get(Request):
+
+    uri = 'repos/{user}/{repo}/issues/events/{id}'
+    resource = Event
diff --git a/pygithub3/requests/issues/labels.py b/pygithub3/requests/issues/labels.py
new file mode 100644
index 0000000..7ba6c7a
--- /dev/null
+++ b/pygithub3/requests/issues/labels.py
@@ -0,0 +1,77 @@
+# -*- encoding: utf-8 -*-
+
+from pygithub3.requests.base import Request, ValidationError
+from pygithub3.resources.issues import Label
+
+
+class List(Request):
+
+    uri = 'repos/{user}/{repo}/labels'
+    resource = Label
+
+
+class Get(Request):
+    uri = 'repos/{user}/{repo}/labels/{name}'
+    resource = Label
+
+
+class Create(Request):
+    uri = 'repos/{user}/{repo}/labels'
+    resource = Label
+    body_schema = {
+        'schema': ('name', 'color'),
+        'required': ('name', 'color')
+    }
+
+    def clean_body(self):
+        color = self.body.get('color', '')
+        if not Label.is_valid_color(color):
+            raise ValidationError('colors must have 6 hexadecimal characters, '
+                                  'without # in the beggining')
+        else:
+            return self.body
+
+
+class Update(Create):
+
+    uri = 'repos/{user}/{repo}/labels/{name}'
+    resource = Label
+    body_schema = {
+        'schema': ('name', 'color'),
+        'required': ('name', 'color')
+    }
+
+
+class Delete(Request):
+    uri = 'repos/{user}/{repo}/labels/{name}'
+    resource = Label
+
+
+class List_by_issue(Request):
+    uri = 'repos/{user}/{repo}/issues/{number}/labels'
+    resource = Label
+
+
+class Add_to_issue(Request):
+    uri = 'repos/{user}/{repo}/issues/{number}/labels'
+    resource = Label
+
+
+class Remove_from_issue(Request):
+    uri = 'repos/{user}/{repo}/issues/{number}/labels/{name}'
+    resource = Label
+
+
+class Replace_all(Request):
+    uri = 'repos/{user}/{repo}/issues/{number}/labels'
+    resource = Label
+
+
+class Remove_all(Request):
+    uri = 'repos/{user}/{repo}/issues/{number}/labels'
+    resource = Label
+
+
+class List_by_milestone(Request):
+    uri = 'repos/{user}/{repo}/milestones/{number}/labels'
+    resource = Label
diff --git a/pygithub3/requests/issues/milestones.py b/pygithub3/requests/issues/milestones.py
new file mode 100644
index 0000000..4093c7e
--- /dev/null
+++ b/pygithub3/requests/issues/milestones.py
@@ -0,0 +1,39 @@
+# -*- encoding: utf-8 -*-
+
+from pygithub3.requests.base import Request, ValidationError
+from pygithub3.resources.issues import Milestone
+
+
+class List(Request):
+    uri = 'repos/{user}/{repo}/milestones'
+    resource = Milestone
+
+
+class Get(Request):
+    uri = 'repos/{user}/{repo}/milestones/{number}'
+    resource = Milestone
+
+
+class Create(Request):
+    uri = 'repos/{user}/{repo}/milestones'
+    resource = Milestone
+    body_schema = {
+        'schema': ('title', 'state', 'description', 'due_on'),
+        'required': ('title',)
+    }
+
+    def clean_body(self):  # Test if API normalize it
+        state = self.body.get('state', '')
+        if state and state.lower() not in ('open', 'closed'):
+            raise ValidationError("'state' must be 'open' or 'closed'")
+        return self.body
+
+
+class Update(Create):
+
+    uri = 'repos/{user}/{repo}/milestones/{number}'
+
+
+class Delete(Request):
+    uri = 'repos/{user}/{repo}/milestones/{number}'
+    resource = Milestone
diff --git a/pygithub3/requests/orgs/__init__.py b/pygithub3/requests/orgs/__init__.py
new file mode 100644
index 0000000..deba5ef
--- /dev/null
+++ b/pygithub3/requests/orgs/__init__.py
@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+
+from pygithub3.requests.base import Request
+from pygithub3.resources.orgs import Org
+
+
+class List(Request):
+    uri = 'users/{user}/orgs'
+    resource = Org
+
+    def clean_uri(self):
+        if not self.user:
+            return 'user/orgs'
+
+
+class Get(Request):
+    uri = 'orgs/{org}'
+    resource = Org
+
+
+class Update(Request):
+    uri = 'orgs/{org}'
+    resource = Org
+    body_schema = {
+        'schema': ('billing_email', 'company', 'email', 'location', 'name'),
+        'required': (),
+    }
diff --git a/pygithub3/requests/orgs/members.py b/pygithub3/requests/orgs/members.py
new file mode 100644
index 0000000..a6b05c2
--- /dev/null
+++ b/pygithub3/requests/orgs/members.py
@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+
+from pygithub3.resources.orgs import Member
+from . import Request
+
+
+class List(Request):
+    uri = 'orgs/{org}/members'
+    resource = Member
+
+
+class Is_member(Request):
+    uri = 'orgs/{org}/members/{user}'
+
+
+class Delete(Request):
+    uri = 'orgs/{org}/members/{user}'
+
+
+class Listpublic(Request):
+    uri = 'orgs/{org}/public_members'
+    resource = Member
+
+
+class Is_public_member(Request):
+    uri = 'orgs/{org}/public_members/{user}'
+
+
+class Publicize(Request):
+    uri = 'orgs/{org}/public_members/{user}'
+
+
+class Conceal(Request):
+    uri = 'orgs/{org}/public_members/{user}'
diff --git a/pygithub3/requests/orgs/teams.py b/pygithub3/requests/orgs/teams.py
new file mode 100644
index 0000000..cc92f9c
--- /dev/null
+++ b/pygithub3/requests/orgs/teams.py
@@ -0,0 +1,74 @@
+# -*- encoding: utf-8 -*-
+
+from pygithub3.resources.orgs import Member, Team
+from pygithub3.resources.repos import Repo
+from . import Request
+
+
+class List(Request):
+    uri = 'orgs/{org}/teams'
+    resource = Team
+
+
+class Get(Request):
+    uri = 'teams/{id}'
+    resource = Team
+
+
+class Create(Request):
+    uri = 'orgs/{org}/teams'
+    resource = Team
+    body_schema = {
+        'schema': ('name', 'repo_names', 'permission',),
+        'required': ('name',),
+    }
+
+    # TODO: Check if this request fails with invalid permission
+    #def clean_body(self):
+
+
+class Update(Request):
+    uri = 'teams/{id}'
+    resource = Team
+    body_schema = {
+        'schema': ('name', 'permission',),
+        'required': ('name',),
+    }
+
+
+class Delete(Request):
+    uri = 'teams/{id}'
+
+
+class List_members(Request):
+    uri = 'teams/{id}/members'
+    resource = Member
+
+
+class Is_member(Request):
+    uri = 'teams/{id}/members/{user}'
+
+
+class Add_member(Request):
+    uri = 'teams/{id}/members/{user}'
+
+
+class Remove_member(Request):
+    uri = 'teams/{id}/members/{user}'
+
+
+class List_repos(Request):
+    uri = 'teams/{id}/repos'
+    resource = Repo
+
+
+class Contains_repo(Request):
+    uri = 'teams/{id}/repos/{user}/{repo}'
+
+
+class Add_repo(Request):
+    uri = 'teams/{id}/repos/{user}/{repo}'
+
+
+class Remove_repo(Request):
+    uri = 'teams/{id}/repos/{user}/{repo}'
diff --git a/pygithub3/requests/pull_requests/__init__.py b/pygithub3/requests/pull_requests/__init__.py
index f25572d..5845dd7 100644
--- a/pygithub3/requests/pull_requests/__init__.py
+++ b/pygithub3/requests/pull_requests/__init__.py
@@ -30,6 +30,7 @@ def clean_body(self):
                                   'issue number or a title and body')
         return self.body
 
+
 class Update(Request):
     uri = 'repos/{user}/{repo}/pulls/{number}'
     resource = PullRequest
diff --git a/pygithub3/requests/repos/__init__.py b/pygithub3/requests/repos/__init__.py
index cd920fe..3e48865 100644
--- a/pygithub3/requests/repos/__init__.py
+++ b/pygithub3/requests/repos/__init__.py
@@ -1,8 +1,10 @@
 # -*- encoding: utf-8 -*-
 
-from pygithub3.requests.base import Request, ValidationError
+from pygithub3.requests.base import Request
+from pygithub3.resources.orgs import Team
+from pygithub3.resources.repos import Repo, Tag, Branch
 from pygithub3.resources.users import User
-from pygithub3.resources.repos import Repo, Team, Tag, Branch
+
 
 class List(Request):
 
@@ -41,6 +43,12 @@ class Get(Request):
     resource = Repo
 
 
+class Delete(Request):
+
+    uri = 'repos/{user}/{repo}'
+    resource = Repo
+
+
 class Update(Request):
 
     uri = 'repos/{user}/{repo}'
@@ -74,7 +82,14 @@ class List_tags(Request):
     uri = 'repos/{user}/{repo}/tags'
     resource = Tag
 
+
 class List_branches(Request):
 
     uri = 'repos/{user}/{repo}/branches'
     resource = Branch
+
+
+class Get_branch(Request):
+
+    uri = 'repos/{user}/{repo}/branches/{branch}'
+    resource = Branch
diff --git a/pygithub3/requests/repos/stargazers.py b/pygithub3/requests/repos/stargazers.py
new file mode 100644
index 0000000..b1feb2a
--- /dev/null
+++ b/pygithub3/requests/repos/stargazers.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+# -*- encoding: utf-8 -*-
+
+from . import Request
+from pygithub3.resources.users import User
+from pygithub3.resources.repos import Repo
+
+
+class List(Request):
+
+    uri = 'repos/{user}/{repo}/stargazers'
+    resource = User
+
+
+class List_repos(Request):
+
+    uri = 'users/{user}/starred'
+    resource = Repo
+
+    def clean_uri(self):
+        if not self.user:
+            return 'user/starred'
+
+
+class Is_starring(Request):
+
+    uri = 'user/starred/{user}/{repo}'
+
+
+class Star(Request):
+
+    uri = 'user/starred/{user}/{repo}'
+
+
+class Unstar(Request):
+
+    uri = 'user/starred/{user}/{repo}'
diff --git a/pygithub3/requests/repos/statuses.py b/pygithub3/requests/repos/statuses.py
new file mode 100644
index 0000000..eaf307d
--- /dev/null
+++ b/pygithub3/requests/repos/statuses.py
@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+# -*- encoding: utf-8 -*-
+
+from . import Request
+
+from pygithub3.resources.repos import Status
+
+
+class List(Request):
+
+    uri = 'repos/{user}/{repo}/statuses/{sha}'
+    resource = Status
+
+
+class Create(Request):
+
+    uri = '/repos/{user}/{repo}/statuses/{sha}'
+    resource = Status
+    body_schema = {
+        'schema': ('state', 'target_url', 'description'),
+        'required': ('state',)}
diff --git a/pygithub3/requests/repos/watchers.py b/pygithub3/requests/repos/watchers.py
index 46e01d7..0889847 100644
--- a/pygithub3/requests/repos/watchers.py
+++ b/pygithub3/requests/repos/watchers.py
@@ -8,30 +8,30 @@
 
 class List(Request):
 
-    uri = 'repos/{user}/{repo}/watchers'
+    uri = 'repos/{user}/{repo}/subscribers'
     resource = User
 
 
 class List_repos(Request):
 
-    uri = 'users/{user}/watched'
+    uri = 'users/{user}/subscriptions'
     resource = Repo
 
     def clean_uri(self):
         if not self.user:
-            return 'user/watched'
+            return 'user/subscriptions'
 
 
 class Is_watching(Request):
 
-    uri = 'user/watched/{user}/{repo}'
+    uri = 'user/subscriptions/{user}/{repo}'
 
 
 class Watch(Request):
 
-    uri = 'user/watched/{user}/{repo}'
+    uri = 'user/subscriptions/{user}/{repo}'
 
 
 class Unwatch(Request):
 
-    uri = 'user/watched/{user}/{repo}'
+    uri = 'user/subscriptions/{user}/{repo}'
diff --git a/pygithub3/resources/base.py b/pygithub3/resources/base.py
index 7045529..25b045c 100644
--- a/pygithub3/resources/base.py
+++ b/pygithub3/resources/base.py
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 
-from pygithub3.core.utils import json
+from pygithub3.core import json
 
 
 class Resource(object):
@@ -11,7 +10,6 @@ class Resource(object):
     _collection_maps = {}
 
     def __init__(self, attrs):
-        """ """
         self._attrs = attrs
         self.__set_attrs()
 
@@ -43,14 +41,6 @@ def wrapper(resource, raw_resource):
                 return func(resource, raw_resource)
             return wrapper
 
-        def parse_date(string_date):
-            from datetime import datetime
-            try:
-                date = datetime.strptime(string_date, '%Y-%m-%dT%H:%M:%SZ')
-            except TypeError:
-                date = None
-            return date
-
         @self_resource
         def parse_map(resource, raw_resource):
             if hasattr(raw_resource, 'items'):
@@ -70,9 +60,6 @@ def parse_collection_map(resource, raw_resources):
                         for raw_resource in raw_resources]
 
         new_resource = raw_resource.copy()
-        new_resource.update(dict([
-            (attr, parse_date(raw_resource[attr]))
-             for attr in self._dates if attr in raw_resource]))
         new_resource.update(dict([
             (attr, parse_map(resource, raw_resource[attr]))
              for attr, resource in self._maps.items()
diff --git a/pygithub3/resources/events.py b/pygithub3/resources/events.py
new file mode 100644
index 0000000..d779c23
--- /dev/null
+++ b/pygithub3/resources/events.py
@@ -0,0 +1,49 @@
+# -*- encoding: utf-8 -*-
+
+from pygithub3.resources.base import Resource
+from pygithub3.resources import users, repos, orgs
+
+
+class Event(Resource):
+
+    _dates = ('created_at', )
+    _maps = {'actor': users.User, 'repo': repos.Repo, 'org': orgs.Org}
+
+    def __str__(self):
+        return '<(%s)>' % getattr(self, 'type', '')
+
+
+class Repo(Resource):
+
+    _dates = ('created_at', )
+    _maps = {'actor': users.User, 'repo': repos.Repo, 'org': orgs.Org}
+
+    def __str__(self):
+        return '<(%s)>' % getattr(self, 'type', '')
+
+
+class Network(Resource):
+
+    _dates = ('created_at', )
+    _maps = {'actor': users.User, 'repo': repos.Repo, 'org': orgs.Org}
+
+    def __str__(self):
+        return '<(%s)>' % getattr(self, 'type', '')
+
+
+class Org(Resource):
+
+    _dates = ('created_at', )
+    _maps = {'actor': users.User, 'repo': repos.Repo, 'org': orgs.Org}
+
+    def __str__(self):
+        return '<(%s)>' % getattr(self, 'type', '')
+
+
+class User(Resource):
+
+    _dates = ('created_at', )
+    _maps = {'actor': users.User, 'repo': repos.Repo, 'org': orgs.Org}
+
+    def __str__(self):
+        return '<(%s)>' % getattr(self, 'type', '')
diff --git a/pygithub3/resources/gists.py b/pygithub3/resources/gists.py
index 89425bf..feb39c1 100644
--- a/pygithub3/resources/gists.py
+++ b/pygithub3/resources/gists.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
 from .base import Resource
@@ -28,6 +27,7 @@ class History(Resource):
     def __str__(self):
         return '<GistHistory (%s)>' % getattr(self, 'version', '')
 
+
 class Gist(Resource):
 
     _dates = ('created_at', )
@@ -37,6 +37,7 @@ class Gist(Resource):
     def __str__(self):
         return '<Gist (%s)>' % getattr(self, 'description', '')
 
+
 class Comment(Resource):
 
     _dates = ('created_at', )
diff --git a/pygithub3/resources/issues.py b/pygithub3/resources/issues.py
new file mode 100644
index 0000000..b2301a6
--- /dev/null
+++ b/pygithub3/resources/issues.py
@@ -0,0 +1,65 @@
+#!/usr/bin/env python
+# -*- encoding: utf-8 -*-
+
+import re
+
+from .base import Resource
+from .users import User
+from .pull_requests import PullRequest
+
+
+class Label(Resource):
+
+    @staticmethod
+    def is_valid_color(color):
+        valid_color = re.compile(r'[0-9abcdefABCDEF]{6}')
+        match = valid_color.match(color)
+        if match is None:
+            return False
+        return match.start() == 0 and match.end() == len(color)
+
+    def __str__(self):
+        return '<Label (%s)>' % getattr(self, 'name', '')
+
+
+class Milestone(Resource):
+
+    _dates = ('created_at', 'due_on')
+    _maps = {'creator': User}
+
+    def __str__(self):
+        return '<Milestone (%s)>' % getattr(self, 'title', '')
+
+
+class Issue(Resource):
+
+    _dates = ('created_at', 'updated_at', 'closed_at')
+    _maps = {
+        'assignee': User,
+        'user': User,
+        'milestone': Milestone,
+        'pull_request': PullRequest
+    }
+
+    _collection_maps = {'labels': Label}
+
+    def __str__(self):
+        return '<Issue (%s)>' % getattr(self, 'number', '')
+
+
+class Comment(Resource):
+
+    _dates = ('created_at', 'updated_at')
+    _maps = {'user': User}
+
+    def __str__(self):
+        return '<Comment (%s)>' % (getattr(self, 'user', ''))
+
+
+class Event(Resource):
+
+    _dates = ('created_at', )
+    _maps = {'actor': User, 'issue': Issue}
+
+    def __str__(self):
+        return '<Event (%s)>' % (getattr(self, 'commit_id', ''))
diff --git a/pygithub3/resources/orgs.py b/pygithub3/resources/orgs.py
index 3996172..f0a9804 100644
--- a/pygithub3/resources/orgs.py
+++ b/pygithub3/resources/orgs.py
@@ -2,6 +2,7 @@
 # -*- encoding: utf-8 -*-
 
 from .base import Resource
+from .users import Plan
 
 __all__ = ('Org', )
 
@@ -9,6 +10,19 @@
 class Org(Resource):
 
     _dates = ('created_at', )
+    _maps = {'plan': Plan}
 
     def __str__(self):
-        return '<Org (%s)>' % getattr(self, 'name', '')
+        return '<Org (%s)>' % getattr(self, 'login', '')
+
+
+class Team(Resource):
+
+    def __str__(self):
+        return '<Team (%s)>' % getattr(self, 'name', '')
+
+
+class Member(Resource):
+
+    def __str__(self):
+        return '<TeamMember (%s)>' % getattr(self, 'login', '')
diff --git a/pygithub3/resources/repos.py b/pygithub3/resources/repos.py
index efd5b13..76d2c35 100644
--- a/pygithub3/resources/repos.py
+++ b/pygithub3/resources/repos.py
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from pygithub3.core.utils import OrderedDict
+from pygithub3.core.compat import OrderedDict
 
 from .base import Resource
 from .users import User
@@ -18,12 +17,6 @@ def __str__(self):
         return '<Repo (%s)>' % getattr(self, 'name', '')
 
 
-class Team(Resource):
-
-    def __str__(self):
-        return '<Team (%s)>' % getattr(self, 'name', '')
-
-
 class Author(Resource):
 
     _dates = ('date')
@@ -115,9 +108,19 @@ def ball_to_upload(self):
             'Policy': self.policy, 'Signature': self.signature,
             'Content-Type': self.mime_type})
 
+
 class Hook(Resource):
 
     _dates = ('created_at', 'pushed_at')
 
     def __str__(self):
         return '<Hook (%s)>' % getattr(self, 'name', '')
+
+
+class Status(Resource):
+
+    _dates = ('created_at', 'updated_at')
+    _maps = {'creator': User}
+
+    def __str__(self):
+        return '<Status (%s)>' % getattr(self, 'state', '')
diff --git a/pygithub3/services/base.py b/pygithub3/services/base.py
index 1059371..0a9ed85 100644
--- a/pygithub3/services/base.py
+++ b/pygithub3/services/base.py
@@ -1,10 +1,9 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
 from pygithub3.core.client import Client
+from pygithub3.core.errors import NotFound
 from pygithub3.core.result import smart, normal
 from pygithub3.requests.base import Factory
-from pygithub3.core.errors import NotFound
 
 
 class Service(object):
@@ -13,12 +12,15 @@ class Service(object):
 
     :param str login: Username to authenticate
     :param str password: Username to authenticate
+    :param str client_id: Client id to prevent rate limiting
+    :param str client_key: Client key to prevent rate limiting
     :param str user: Default username in requests
     :param str repo: Default repository in requests
     :param str token: Token to OAuth
     :param int per_page: Items in each page of multiple returns
     :param str base_url: To support another github-related API (untested)
     :param stream verbose: Stream to write debug logs
+    :param timeout float: Timeout for requests
 
     You can configure the **authentication** with BasicAuthentication (login
     and password) and with `OAuth <http://developer.github.com/v3/oauth/>`_ (
@@ -73,6 +75,14 @@ def set_credentials(self, login, password):
         """
         self._client.set_credentials(login, password)
 
+    def set_oauth_credentials(self, client_id, client_key):
+        """ Set Oauth Identification
+
+        :param str client_id: Client id to prevent rate limiting
+        :param str client_key: Client key to prevent rate limiting
+        """
+        self._client.set_oauth_credentials(client_id, client_key)
+
     def set_token(self, token):
         """ Set OAuth token
 
@@ -111,10 +121,10 @@ def _patch(self, request, **kwargs):
     def _put(self, request, **kwargs):
         """ Bug in Github API? requests library?
 
-        I must send data as empty string when the specifications' of some PUT
-        request are 'Not send input data'. If I don't do that and send data as
-        None, the requests library doesn't send 'Content-length' header and the
-        server returns 411 - Required Content length (at least 0)
+        I must send data when the specifications' of some PUT request are 'Not
+        send input data'. If I don't do that and send data as None, the
+        requests library doesn't send 'Content-length' header and the server
+        returns 411 - Required Content length (at least 0)
 
         For instance:
             - follow-user request doesn't send input data
@@ -125,7 +135,7 @@ def _put(self, request, **kwargs):
 
         Related: https://github.com/github/developer.github.com/pull/52
         """
-        input_data = request.get_body() or ''
+        input_data = request.get_body() or 'PLACEHOLDER'
         response = self._client.put(request, data=input_data, **kwargs)
         if response.status_code != 204:  # != NO_CONTENT
             return request.resource.loads(response.content)
diff --git a/pygithub3/services/events/__init__.py b/pygithub3/services/events/__init__.py
new file mode 100644
index 0000000..7e9ead6
--- /dev/null
+++ b/pygithub3/services/events/__init__.py
@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+
+from pygithub3.services.base import Service
+from pygithub3.services import issues
+from pygithub3.services.events import networks, orgs, repos, users
+
+
+class Event(Service):
+    """ Consume `Events API <http://developer.github.com/v3/events>`_
+
+    The events API supports pagination, but with a fixed page size of 30; In
+    addition, fetching up to ten pages is supported, for a total of 300 events.
+    """
+
+    def __init__(self, **config):
+        self.issues = issues.events.Events(**config)
+        self.networks = networks.Network(**config)
+        self.orgs = orgs.Org(**config)
+        self.repos = repos.Repo(**config)
+        self.users = users.User(**config)
+        super(Event, self).__init__(**config)
+
+    def list(self):
+        """ List all public events.
+
+        :returns: A :doc:`result`
+
+        .. note::
+            Hits the API fetching maximum number of events (300 = 30/page * 10)
+        """
+
+        """ TODO
+            This method uses ``_get_normal_result`` which hits the API fetching
+            maximum number of events (300 = 30/page * 10).
+
+            If there's a good way to tell ``smart.Method`` about the last page
+            ahead of time, that may be a better way to proceed. Otherwise it
+            tries to set that via ``_set_last_page_from`` which fails because
+            that data is not in the returned header.
+        """
+        request = self.request_builder('events.list')
+        return self._get_normal_result(request, per_page=None)
diff --git a/pygithub3/services/events/networks.py b/pygithub3/services/events/networks.py
new file mode 100644
index 0000000..12f16f7
--- /dev/null
+++ b/pygithub3/services/events/networks.py
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+
+from pygithub3.services.base import Service
+
+
+class Network(Service):
+    """ Consume a Repo's public `Network Events API
+    <http://developer.github.com/v3/events>`_
+
+    """
+
+    def list(self, user=None, repo=None):
+        """ List the events for a repository's Network
+
+        :param str user: Username
+        :param str repo: Repository
+        :returns: A :doc:`result`
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('events.networks.list',
+                                    user=user, repo=repo)
+        return self._get_normal_result(request)
diff --git a/pygithub3/services/events/orgs.py b/pygithub3/services/events/orgs.py
new file mode 100644
index 0000000..fc50856
--- /dev/null
+++ b/pygithub3/services/events/orgs.py
@@ -0,0 +1,20 @@
+# -*- encoding: utf-8 -*-
+
+from pygithub3.services.base import Service
+
+
+class Org(Service):
+    """ Consume a `Org Events API
+    <http://developer.github.com/v3/events>`_
+
+    """
+
+    def list(self, org=None):
+        """ List the events for an Organization
+
+        :param str org: Organization name
+        :returns: A :doc:`result`
+
+        """
+        request = self.make_request('events.orgs.list', org=org)
+        return self._get_normal_result(request)
diff --git a/pygithub3/services/events/repos.py b/pygithub3/services/events/repos.py
new file mode 100644
index 0000000..b8b667c
--- /dev/null
+++ b/pygithub3/services/events/repos.py
@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+
+from pygithub3.services.base import Service
+
+
+class Repo(Service):
+    """ Consume `Repo Events API
+    <http://developer.github.com/v3/events/#list-repository-events>`_
+
+    """
+
+    def list(self, user=None, repo=None):
+        """ Get repository's events
+
+        :param str user: Username
+        :param str repo: Repository
+        :returns: A :doc:`result`
+
+        .. note::
+            Remember :ref:`config precedence`
+
+        .. note::
+            Remember that the Events API give 10 pages with 30 entries, up to
+            300 events, so you'll only get the last 300 Repo events
+        """
+        request = self.make_request('events.repos.list', user=user, repo=repo)
+        return self._get_normal_result(request)
diff --git a/pygithub3/services/events/users.py b/pygithub3/services/events/users.py
new file mode 100644
index 0000000..3ad5032
--- /dev/null
+++ b/pygithub3/services/events/users.py
@@ -0,0 +1,78 @@
+# -*- encoding: utf-8 -*-
+
+from pygithub3.services.base import Service
+
+
+class User(Service):
+    """ Consume `User Events API
+    <http://developer.github.com/v3/events>`_
+
+    """
+
+    def list_received(self, user=None):
+        """ List the events received by a given user. If authenticated as the
+        given user, you'll see private events as well as public events.
+
+        :param str user: Username
+        :returns: A :doc:`result`
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('events.users.list_received', user=user)
+        return self._get_normal_result(request)
+
+    def list_received_public(self, user=None):
+        """ List only the public events received by the given user.
+
+        :param str user: Username
+        :returns: A :doc:`result`
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('events.users.list_received_public',
+                                    user=user)
+        return self._get_normal_result(request)
+
+    def list_performed(self, user=None):
+        """ List the events performed by a given user. If authenticated as the
+        given user, you'll see private events as well as public events.
+
+        :param str user: Username
+        :returns: A :doc:`result`
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('events.users.list_performed', user=user)
+        return self._get_normal_result(request)
+
+    def list_performed_public(self, user=None):
+        """ List only the public events performed by the given user.
+
+        :param str user: Username
+        :returns: A :doc:`result`
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('events.users.list_performed_public',
+                                    user=user)
+        return self._get_normal_result(request)
+
+    def orgs(self, user=None, org=None):
+        """ List the events for the User's organization dashboard.
+
+        :param str user: Username
+        :returns: A :doc:`result`
+
+        .. warning::
+            You must be authenticated as the given user.
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('events.users.list_org_events',
+                                    user=user, org=org)
+        return self._get_normal_result(request)
diff --git a/pygithub3/services/git_data/__init__.py b/pygithub3/services/git_data/__init__.py
index 4a3ff9f..c635bdd 100644
--- a/pygithub3/services/git_data/__init__.py
+++ b/pygithub3/services/git_data/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
 from pygithub3.services.base import Service
@@ -8,6 +7,7 @@
 from .tags import Tags
 from .trees import Trees
 
+
 class GitData(Service):
     """Consume `Git Data API <http://developer.github.com/v3/git/>`_"""
 
diff --git a/pygithub3/services/issues/__init__.py b/pygithub3/services/issues/__init__.py
new file mode 100644
index 0000000..ca3aad8
--- /dev/null
+++ b/pygithub3/services/issues/__init__.py
@@ -0,0 +1,119 @@
+# -*- encoding: utf-8 -*-
+
+from pygithub3.services.base import Service, MimeTypeMixin
+from .comments import Comments
+from .events import Events
+from .labels import Labels
+from .milestones import Milestones
+
+
+class Issue(Service, MimeTypeMixin):
+    """ Consume `Issues API <http://developer.github.com/v3/issues>`_ """
+
+    def __init__(self, **config):
+        self.comments = Comments(**config)
+        self.events = Events(**config)
+        self.labels = Labels(**config)
+        self.milestones = Milestones(**config)
+        super(Issue, self).__init__(**config)
+
+    def list(self, filter='assigned', state='open', labels='', sort='created',
+            direction='desc', since=None):
+        """ List your issues
+
+        :param str filter: 'assigned', 'created', 'mentioned' or 'subscribed'
+        :param str state: 'open' or 'closed'
+        :param str labels: List of comma separated Label names. e.g: bug,ui,
+                           @high
+        :param str sort: 'created', 'updated' or 'comments'
+        :param str direction: 'asc' or 'desc'
+        :param datetime since: Date filter (datetime or str in ISO 8601)
+        :returns: A :doc:`result`
+
+        .. warning::
+            You must be authenticated
+        """
+        params = dict(filter=filter, state=state, labels=labels, sort=sort,
+            direction=direction)
+        request = self.request_builder('issues.list')
+        return self._get_result(request, **params)
+
+    def list_by_repo(self, user=None, repo=None, milestone='*', state='open',
+            assignee='*', mentioned='', labels='', sort='created',
+            direction='desc', since=None):
+        """ List issues for a repo
+
+        :param str milestone: Milestone ID, 'none' or '*'
+        :param str state: 'open' or 'closed'
+        :param str assignee: Username, 'none' or '*'
+        :param str mentioned: Username
+        :param str labels: List of comma separated Label names. e.g: bug,ui,
+                           @high
+        :param str sort: 'created', 'updated' or 'comments'
+        :param str direction: 'asc' or 'desc'
+        :param datetime since: Date filter (datetime or str in ISO 8601)
+        :returns: A :doc:`result`
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        params = dict(milestone=milestone, state=state, assignee=assignee,
+            mentioned=mentioned, labels=labels, sort=sort, direction=direction)
+        request = self.make_request('issues.list_by_repo', user=user,
+            repo=repo)
+        return self._get_result(request, **params)
+
+    def get(self, number, user=None, repo=None):
+        """ Get a single issue
+
+        :param int number: Issue number
+        :param str user: Username
+        :param str repo: Repo name
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('issues.get', user=user, repo=repo,
+            number=number)
+        return self._get(request)
+
+    def create(self, data, user=None, repo=None):
+        """ Create an issue
+
+        :param dict data: Input. See `github issues doc`_
+        :param str user: Username
+        :param str repo: Repo name
+
+        .. warning::
+            You must be authenticated
+
+        .. note::
+            Remember :ref:`config precedence`
+
+        ::
+
+            issues_service.create(dict(title='My test issue',
+                body='This needs to be fixed ASAP.',
+                assignee='copitux'))
+        """
+        request = self.make_request('issues.create', user=user, repo=repo,
+            body=data)
+        return self._post(request)
+
+    def update(self, number, data, user=None, repo=None):
+        """ Update an issue
+
+        :param int number: Issue number
+        :param dict data: Input. See `github issues doc`_
+        :param str user: Username
+        :param str repo: Repo name
+
+        .. warning::
+            You must be authenticated
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('issues.update', user=user, repo=repo,
+            number=number, body=data)
+        return self._patch(request)
diff --git a/pygithub3/services/issues/comments.py b/pygithub3/services/issues/comments.py
new file mode 100644
index 0000000..a5a9759
--- /dev/null
+++ b/pygithub3/services/issues/comments.py
@@ -0,0 +1,90 @@
+# -*- encoding: utf-8 -*-
+
+from pygithub3.services.base import Service, MimeTypeMixin
+
+
+class Comments(Service, MimeTypeMixin):
+    """ Consume `Comments API
+    <http://developer.github.com/v3/issues/comments>`_ """
+
+    def list(self, number, user=None, repo=None):
+        """ List comments for an issue
+
+        :param int number: Issue number
+        :param str user: Username
+        :param str repo: Repo name
+        :returns: A :doc:`result`
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('issues.comments.list', user=user,
+            repo=repo, number=number)
+        return self._get_result(request)
+
+    def get(self, id, user=None, repo=None):
+        """ Get a single comment
+
+        :param int id: Comment id
+        :param str user: Username
+        :param str repo: Repo name
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('issues.comments.get', user=user,
+            repo=repo, id=id)
+        return self._get(request)
+
+    def create(self, number, message, user=None, repo=None):
+        """ Create a comment on an issue
+
+        :param int number: Issue number
+        :param str message: Comment message
+        :param str user: Username
+        :param str repo: Repo name
+
+        .. warning::
+            You must be authenticated
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('issues.comments.create', user=user,
+            repo=repo, number=number, body={'body': message})
+        return self._post(request)
+
+    def update(self, id, message, user=None, repo=None):
+        """ Update a comment on an issue
+
+        :param int id: Issue id
+        :param str message: Comment message
+        :param str user: Username
+        :param str repo: Repo name
+
+        .. warning::
+            You must be authenticated
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('issues.comments.edit', user=user,
+            repo=repo, id=id, body={'body': message})
+        return self._patch(request)
+
+    def delete(self, id, user=None, repo=None):
+        """ Delete a single comment
+
+        :param int id: Comment id
+        :param str user: Username
+        :param str repo: Repo name
+
+        .. warning::
+            You must be authenticated
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('issues.comments.delete', user=user,
+            repo=repo, id=id)
+        self._delete(request)
diff --git a/pygithub3/services/issues/events.py b/pygithub3/services/issues/events.py
new file mode 100644
index 0000000..c7954bd
--- /dev/null
+++ b/pygithub3/services/issues/events.py
@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+
+from pygithub3.services.base import Service
+
+
+class Events(Service):
+    """ Consume `Issues Events API
+    <http://developer.github.com/v3/issues/events>`_ """
+
+    def list_by_issue(self, number, user=None, repo=None):
+        """ List events for an issue
+
+        :param int number: Issue number
+        :param str user: Username
+        :param str repo: Repo name
+        :returns: A :doc:`result`
+        """
+        request = self.make_request('issues.events.list_by_issue',
+            user=user, repo=repo, number=number)
+        return self._get_result(request)
+
+    def list_by_repo(self, user=None, repo=None):
+        """ List events for a repository
+
+        :param str user: Username
+        :param str repo: Repo name
+        :returns: A :doc:`result`
+        """
+        request = self.make_request('issues.events.list_by_repo',
+            user=user, repo=repo)
+        return self._get_result(request)
+
+    def get(self, id, user=None, repo=None):
+        """ Get a single event
+
+        :param int id: Comment id
+        :param str user: Username
+        :param str repo: Repo name
+        """
+        request = self.make_request('issues.events.get', user=user,
+            repo=repo, id=id)
+        return self._get(request)
diff --git a/pygithub3/services/issues/labels.py b/pygithub3/services/issues/labels.py
new file mode 100644
index 0000000..d1119d3
--- /dev/null
+++ b/pygithub3/services/issues/labels.py
@@ -0,0 +1,197 @@
+#!/usr/bin/env python
+# -*- encoding: utf-8 -*-
+
+from pygithub3.services.base import Service
+
+
+class Labels(Service):
+    """ Consume `Labels API
+    <http://developer.github.com/v3/issues/labels>`_ """
+
+    def list(self, user=None, repo=None):
+        """ Get repository's labels
+
+        :param str user: Username
+        :param str repo: Repository
+        :returns: A :doc:`result`
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('issues.labels.list', user=user, repo=repo)
+        return self._get_result(request)
+
+    def get(self, name, user=None, repo=None):
+        """ Get a single label
+
+        :param str name: Label name
+        :param str user: Username
+        :param str repo: Repo name
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('issues.labels.get', user=user,
+            repo=repo, name=name)
+        return self._get(request)
+
+    def create(self, data, user=None, repo=None):
+        """ Create a label on an repo
+
+        :param dict data: Input. See `github labels doc`_
+        :param str user: Username
+        :param str repo: Repo name
+
+        .. warning::
+            You must be authenticated
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('issues.labels.create', user=user,
+            repo=repo, body=data)
+        return self._post(request)
+
+    def update(self, name, data, user=None, repo=None):
+        """ Update a label on an repo
+
+        :param str name: Label name
+        :param dict data: Input. See `github labels doc`_
+        :param str user: Username
+        :param str repo: Repo name
+
+        .. warning::
+            You must be authenticated
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('issues.labels.update', user=user,
+            repo=repo, name=name, body=data)
+        return self._patch(request)
+
+    def delete(self, name, user=None, repo=None):
+        """ Delete a label on an repo
+
+        :param str name: Label name
+        :param str user: Username
+        :param str repo: Repo name
+
+        .. warning::
+            You must be authenticated
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('issues.labels.delete', user=user,
+            repo=repo, name=name)
+        return self._delete(request)
+
+    def list_by_issue(self, number, user=None, repo=None):
+        """ List labels for an issue
+
+        :param int number: Issue number
+        :param str user: Username
+        :param str repo: Repo name
+        :returns: A :doc:`result`
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('issues.labels.list_by_issue', user=user,
+            repo=repo, number=number)
+        return self._get(request)
+
+    def add_to_issue(self, number, labels, user=None, repo=None):
+        """ Add labels to issue
+
+        :param int number: Issue number
+        :param str user: Username
+        :param str repo: Repo name
+        :param list labels: Label names
+        :returns: A :doc:`result`
+
+        .. note::
+            Remember :ref:`config precedence`
+
+        ::
+
+            labels_service.add_to_issue(2, user='github', repo='github',
+                'label1', 'label2', 'label3')
+        """
+        request = self.make_request('issues.labels.add_to_issue', user=user,
+            repo=repo, number=number, body=map(str, labels))
+        return self._post(request)
+
+    def remove_from_issue(self, number, label, user=None, repo=None):
+        """ Remove a label from an issue
+
+        :param int number: Issue number
+        :param str label: Label name
+        :param str user: Username
+        :param str repo: Repo name
+        :returns: A :doc:`result`
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('issues.labels.remove_from_issue',
+                                       user=user,
+                                       repo=repo,
+                                       number=number,
+                                       name=label)
+        return self._delete(request)
+
+    def replace_all(self, number, labels, user=None, repo=None):
+        """ Replace all labels for a issue
+
+        :param int number: Issue number
+        :param list labels: New labels
+        :param str user: Username
+        :param str repo: Repo name
+        :returns: A :doc:`result`
+
+        .. note::
+            If labels weren't especified, it'd remove all labels from the issue
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('issues.labels.replace_all',
+                                       user=user,
+                                       repo=repo,
+                                       number=number,
+                                       body=map(str, labels))
+        return self._put(request)
+
+    def remove_all(self, number, user=None, repo=None):
+        """ Remove all labels from a issue
+
+        :param int number: Issue number
+        :param str user: Username
+        :param str repo: Repo name
+        :returns: A :doc:`result`
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('issues.labels.remove_all',
+                                       user=user,
+                                       repo=repo,
+                                       number=number,)
+        return self._delete(request)
+
+    def list_by_milestone(self, number, user=None, repo=None):
+        """ Get labels for every issue in a milestone
+
+        :param int number: Milestone ID
+        :param str user: Username
+        :param str repo: Repo name
+        :returns: A :doc:`result`
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('issues.labels.list_by_milestone',
+            user=user, repo=repo, number=number)
+        return self._get_result(request)
diff --git a/pygithub3/services/issues/milestones.py b/pygithub3/services/issues/milestones.py
new file mode 100644
index 0000000..1126805
--- /dev/null
+++ b/pygithub3/services/issues/milestones.py
@@ -0,0 +1,94 @@
+#!/usr/bin/env python
+# -*- encoding: utf-8 -*-
+
+from pygithub3.services.base import Service
+
+
+class Milestones(Service):
+    """ Consume `Milestones API
+    <http://developer.github.com/v3/issues/milestones>`_ """
+
+    def list(self, user=None, repo=None, state='open', sort='due_date',
+            direction='desc'):
+        """ List milestones for a repo
+
+        :param str user: Username
+        :param str repo: Repo name
+        :param str state: 'open' or 'closed'
+        :param str sort: 'due_date' or 'completeness'
+        :param str direction: 'asc' or 'desc'
+        :returns: A :doc:`result`
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('issues.milestones.list', user=user,
+            repo=repo)
+        return self._get_result(request, state=state, sort=sort,
+            direction=direction)
+
+    def get(self, number, user=None, repo=None):
+        """ Get a single milestone
+
+        :param int number: Milestone number
+        :param str user: Username
+        :param str repo: Repo name
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('issues.milestones.get', user=user,
+            repo=repo, number=number)
+        return self._get(request)
+
+    def create(self, data, user=None, repo=None):
+        """ Create a milestone
+
+        :param dict data: Input. See `github milestones doc`_
+        :param str user: Username
+        :param str repo: Repo name
+
+        .. warning::
+            You must be authenticated
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('issues.milestones.create', user=user,
+            repo=repo, body=data)
+        return self._post(request)
+
+    def update(self, number, data, user=None, repo=None):
+        """ Update a milestone
+
+        :param int number: Milestone number
+        :param dict data: Input. See `github milestones doc`_
+        :param str user: Username
+        :param str repo: Repo name
+
+        .. warning::
+            You must be authenticated
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('issues.milestones.update', user=user,
+            repo=repo, number=number, body=data)
+        return self._patch(request)
+
+    def delete(self, number, user=None, repo=None):
+        """ Delete a milestone
+
+        :param int number: Milestone number
+        :param str user: Username
+        :param str repo: Repo name
+
+        .. warning::
+            You must be authenticated
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('issues.milestones.delete', user=user,
+            repo=repo, number=number)
+        self._delete(request)
diff --git a/pygithub3/services/orgs/__init__.py b/pygithub3/services/orgs/__init__.py
new file mode 100644
index 0000000..8499719
--- /dev/null
+++ b/pygithub3/services/orgs/__init__.py
@@ -0,0 +1,58 @@
+# -*- encoding: utf-8 -*-
+
+from pygithub3.services.base import Service
+from .members import Members
+from .teams import Teams
+
+
+class Org(Service):
+    """ Consume `Orgs API <http://developer.github.com/v3/orgs>`_ """
+
+    def __init__(self, **config):
+        self.members = Members(**config)
+        self.teams = Teams(**config)
+        super(Org, self).__init__(**config)
+
+    def list(self, user=None):
+        """ Get user's orgs
+
+        :param str user: Username
+        :returns: A :doc:`result`
+
+        If you call it without user and you are authenticated, get the
+        authenticated user's orgs, public and private.
+
+        If you call it with a user, get the user's public orgs.
+
+        ::
+
+            org_service.list('copitux')
+            org_service.list()
+        """
+        request = self.request_builder('orgs.list', user=user)
+        return self._get_result(request)
+
+    def get(self, org):
+        """ Get a single org
+
+        :param str org: Org name
+        """
+        request = self.request_builder('orgs.get', org=org)
+        return self._get(request)
+
+    def update(self, org, data):
+        """ Update a single org
+
+        :param str org: Org name
+        :param dict data: Input. See `github orgs doc`_
+
+        .. warning ::
+            You must be authenticated
+
+        ::
+
+            org_service.update(dict(company='ACME Development',
+                                    location='Timbuctoo'))
+        """
+        request = self.request_builder('orgs.update', org=org, body=data)
+        return self._patch(request)
diff --git a/pygithub3/services/orgs/members.py b/pygithub3/services/orgs/members.py
new file mode 100644
index 0000000..23dc035
--- /dev/null
+++ b/pygithub3/services/orgs/members.py
@@ -0,0 +1,93 @@
+# -*- encoding: utf-8 -*-
+
+from pygithub3.services.base import Service
+
+
+class Members(Service):
+    """ Consume `Members API <http://developer.github.com/v3/orgs/members/>`_
+    """
+
+    def list(self, org):
+        """ Get org's members
+
+        :param str org: Organisation name
+        :returns: A :doc:`result`
+
+        If you call it authenticated, and are a member of the org, public and
+        private members will be visible.
+
+        If not, only public members will be visible.
+        """
+        request = self.request_builder('orgs.members.list', org=org)
+        return self._get_result(request)
+
+    def is_member(self, org, user):
+        """ Determine if user is a member of org
+
+        :param str org: Organisation name
+        :param str user: User name
+        """
+        request = self.request_builder('orgs.members.is_member', org=org,
+            user=user)
+        return self._bool(request)
+
+    def remove_member(self, org, user):
+        """ Remove user from all teams in org
+
+        :param str org: Organisation name
+        :param str user: User name
+
+        .. warning ::
+            You must be authenticated and an owner of org
+
+        """
+        request = self.request_builder('orgs.members.delete', org=org,
+            user=user)
+        return self._delete(request)
+
+    def list_public(self, org):
+        """ Get org's public members
+
+        :param str org: Organisation name
+        :returns: A :doc:`result`
+        """
+        request = self.request_builder('orgs.members.listpublic', org=org)
+        return self._get_result(request)
+
+    def is_public_member(self, org, user):
+        """ Determine if user is a public member of org
+
+        :param str org: Organisation name
+        :param str user: User name
+        """
+        request = self.request_builder('orgs.members.is_public_member',
+                                       org=org, user=user)
+        return self._bool(request)
+
+    def publicize_membership(self, org, user):
+        """ Publicize user's membership in org
+
+        :param str org: Organisation name
+        :param str user: User name
+
+        .. warning ::
+            You must be authenticated and the user, or an owner of the org
+
+        """
+        request = self.request_builder('orgs.members.publicize',
+                                       org=org, user=user)
+        return self._put(request)
+
+    def conceal_membership(self, org, user):
+        """ Conceal user's membership in org
+
+        :param str org: Organisation name
+        :param str user: User name
+
+        .. warning ::
+            You must be authenticated and the user, or an owner of the org
+
+        """
+        request = self.request_builder('orgs.members.conceal',
+                                       org=org, user=user)
+        return self._delete(request)
diff --git a/pygithub3/services/orgs/teams.py b/pygithub3/services/orgs/teams.py
new file mode 100644
index 0000000..84aa855
--- /dev/null
+++ b/pygithub3/services/orgs/teams.py
@@ -0,0 +1,136 @@
+# -*- encoding: utf-8 -*-
+
+from . import Service
+
+
+class Teams(Service):
+    """ Consume `Teams API <http://developer.github.com/v3/orgs/teams/>`_
+
+    .. warning ::
+        You must be authenticated as an owner of the org
+    """
+
+    def list(self, org):
+        """ Get org's teams
+
+        :param str org: Organisation name
+        :returns: A :doc:`result`
+        """
+        request = self.request_builder('orgs.teams.list', org=org)
+        return self._get_result(request)
+
+    def get(self, id):
+        """ Get a team
+
+        :param int id: The team id
+        :returns: A :doc:`result`
+        """
+        request = self.request_builder('orgs.teams.get', id=id)
+        return self._get(request)
+
+    def create(self, org, data):
+        """ Create a new team
+
+        :param str org: Organisation name
+        :param dict data: Input. See `github orgs teams doc`_
+        """
+        request = self.request_builder('orgs.teams.create', org=org, body=data)
+        return self._post(request)
+
+    def update(self, id, data):
+        """ Update a team
+
+        :param int id: The team id
+        :param dict data: Input. See `github orgs teams doc`_
+        """
+        request = self.request_builder('orgs.teams.update', id=id, body=data)
+        return self._patch(request)
+
+    def delete(self, id):
+        """ Delete a team
+
+        :param int id: The team id
+        """
+        request = self.request_builder('orgs.teams.delete', id=id)
+        return self._delete(request)
+
+    def list_members(self, id):
+        """ List the members of a team
+
+        :param int id: The team id
+        :returns: A :doc:`result`
+        """
+        request = self.request_builder('orgs.teams.list_members', id=id)
+        return self._get_result(request)
+
+    def is_member(self, id, user):
+        """ Determine if user is a member of a team
+
+        :param int id: The team id
+        :param str user: User name
+        """
+        request = self.request_builder('orgs.teams.is_member',
+                                       id=id, user=user)
+        return self._bool(request)
+
+    def add_member(self, id, user):
+        """ Add a user to a team
+
+        :param int id: The team id
+        :param str user: User name
+        """
+        request = self.request_builder('orgs.teams.add_member',
+                                       id=id, user=user)
+        return self._put(request)
+
+    def remove_member(self, id, user):
+        """ Remove a member from a team
+
+        :param int id: The team id
+        :param str user: User name
+        """
+        request = self.request_builder('orgs.teams.remove_member',
+                                       id=id, user=user)
+        return self._delete(request)
+
+    def list_repos(self, id):
+        """ List the repos that a team's members get access to
+
+        :param int id: The team id
+        :returns: A :doc:`result`
+        """
+        request = self.request_builder('orgs.teams.list_repos', id=id)
+        return self._get_result(request)
+
+    def contains_repo(self, id, user, repo):
+        """ Determine if user is a member of a team
+
+        :param int id: The team id
+        :param str user: User name
+        :param str repo: Repo name
+        """
+        request = self.request_builder('orgs.teams.contains_repo',
+                                       id=id, user=user, repo=repo)
+        return self._bool(request)
+
+    def add_repo(self, id, user, repo):
+        """ Give team members access to a repo
+
+        :param int id: The team id
+        :param str user: User name
+        :param str repo: Repo name
+        """
+        request = self.request_builder('orgs.teams.add_repo',
+                                       id=id, user=user, repo=repo)
+        return self._put(request)
+
+    def remove_repo(self, id, user, repo):
+        """ Remove a repo from the a team
+
+        :param int id: The team id
+        :param str user: User name
+        :param str repo: Repo name
+        """
+        request = self.request_builder('orgs.teams.remove_repo',
+                                       id=id, user=user, repo=repo)
+        return self._delete(request)
diff --git a/pygithub3/services/pull_requests/__init__.py b/pygithub3/services/pull_requests/__init__.py
index 545f862..49c1939 100644
--- a/pygithub3/services/pull_requests/__init__.py
+++ b/pygithub3/services/pull_requests/__init__.py
@@ -11,9 +11,10 @@ def __init__(self, **config):
         self.comments = Comments(**config)
         super(PullRequests, self).__init__(**config)
 
-    def list(self, user=None, repo=None):
+    def list(self, state='open', user=None, repo=None):
         """List all of the pull requests for a repo
 
+        :param str state: Pull requests state ('open' or 'closed')
         :param str user: Username
         :param str repo: Repository
         :returns: A :doc:`result`
@@ -22,7 +23,8 @@ def list(self, user=None, repo=None):
             Remember :ref:`config precedence`
         """
         return self._get_result(
-            self.make_request('pull_requests.list', user=user, repo=repo)
+            self.make_request('pull_requests.list', user=user, repo=repo),
+            state=state
         )
 
     def get(self, number, user=None, repo=None):
diff --git a/pygithub3/services/repos/__init__.py b/pygithub3/services/repos/__init__.py
index 628e9d6..9980dcc 100644
--- a/pygithub3/services/repos/__init__.py
+++ b/pygithub3/services/repos/__init__.py
@@ -1,14 +1,15 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from pygithub3.services.base import Service, MimeTypeMixin
+from pygithub3.services.base import Service
 from .collaborators import Collaborators
 from .commits import Commits
 from .downloads import Downloads
 from .forks import Forks
 from .keys import Keys
 from .watchers import Watchers
+from .stargazers import Stargazers
 from .hooks import Hooks
+from .statuses import Statuses
 
 
 class Repo(Service):
@@ -21,14 +22,18 @@ def __init__(self, **config):
         self.forks = Forks(**config)
         self.keys = Keys(**config)
         self.watchers = Watchers(**config)
+        self.stargazers = Stargazers(**config)
         self.hooks = Hooks(**config)
+        self.statuses = Statuses(**config)
         super(Repo, self).__init__(**config)
 
-    def list(self, user=None, type='all'):
+    def list(self, user=None, type='all', sort='full_name', direction='desc'):
         """ Get user's repositories
 
         :param str user: Username
-        :param str type: Filter by type (optional). See `github repos doc`_
+        :param str type: *all*, owner, public, private, member
+        :param str sort: created, updated, pushed, *full_name*
+        :param str direction: asc or *desc*
         :returns: A :doc:`result`
 
         If you call it without user and you are authenticated, get the
@@ -43,13 +48,14 @@ def list(self, user=None, type='all'):
             repo_service.list(type='private')
         """
         request = self.request_builder('repos.list', user=user)
-        return self._get_result(request, type=type)
+        return self._get_result(request, type=type, sort=sort,
+            direction=direction)
 
     def list_by_org(self, org, type='all'):
         """ Get organization's repositories
 
         :param str org: Organization name
-        :param str type: Filter by type (optional). See `github repos doc`_
+        :param str type: *all*, public, member, private
         :returns: A :doc:`result`
 
         ::
@@ -81,6 +87,18 @@ def create(self, data, in_org=None):
         request = self.make_request('repos.create', org=in_org, body=data)
         return self._post(request)
 
+    def delete(self, user=None, repo=None):
+        """ Delete a single repo
+
+        :param str user: Username
+        :param str repo: Repository
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('repos.delete', user=user, repo=repo)
+        return self._delete(request)
+
     def get(self, user=None, repo=None):
         """ Get a single repo
 
@@ -135,7 +153,7 @@ def list_contributors(self, user=None, repo=None):
     def list_contributors_with_anonymous(self, user=None, repo=None):
         """ Like :attr:`~pygithub3.services.repos.Repo.list_contributors` plus
         anonymous """
-        return self.__list_contributors(user, repo, anom=True)
+        return self.__list_contributors(user, repo, anon=True)
 
     def list_languages(self, user=None, repo=None):
         """ Get repository's languages
@@ -190,3 +208,17 @@ def list_branches(self, user=None, repo=None):
         request = self.make_request('repos.list_branches',
             user=user, repo=repo)
         return self._get_result(request)
+
+    def get_branch(self, branchname, user=None, repo=None):
+        """ Get branch
+
+        :param str user: Username
+        :param str repo: Repository
+        :param str branchname
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('repos.get_branch', user=user,
+            repo=repo, branch=branchname)
+        return self._get(request)
diff --git a/pygithub3/services/repos/commits.py b/pygithub3/services/repos/commits.py
index 4ba1ff1..0a37c42 100644
--- a/pygithub3/services/repos/commits.py
+++ b/pygithub3/services/repos/commits.py
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from . import Service, MimeTypeMixin
+from pygithub3.services.base import Service, MimeTypeMixin
 
 
 class Commits(Service, MimeTypeMixin):
diff --git a/pygithub3/services/repos/downloads.py b/pygithub3/services/repos/downloads.py
index 47c7785..25114a5 100644
--- a/pygithub3/services/repos/downloads.py
+++ b/pygithub3/services/repos/downloads.py
@@ -72,9 +72,9 @@ def create(self, data, user=None, repo=None):
         # TODO: improve it. e.g Manage all with file desc
         def upload(file_path):
             """ """
-            body = download.ball_to_upload()
-            body['file'] = (file_path, open(file_path, 'rb'))
-            return requests.post(download.s3_url, files=body)
+            data = download.ball_to_upload()
+            files = {'File': open(file_path, 'rb')}
+            return requests.post(download.s3_url, data=data, files=files)
 
         download.upload = upload
         return download
diff --git a/pygithub3/services/repos/stargazers.py b/pygithub3/services/repos/stargazers.py
new file mode 100644
index 0000000..535dd8d
--- /dev/null
+++ b/pygithub3/services/repos/stargazers.py
@@ -0,0 +1,92 @@
+#!/usr/bin/env python
+# -*- encoding: utf-8 -*-
+
+from . import Service
+
+
+class Stargazers(Service):
+    """ Consume `starring API
+    <http://developer.github.com/v3/repos/starring>`_ """
+
+    def list(self, user=None, repo=None):
+        """ Get repository's stargazers
+
+        :param str user: Username
+        :param str repo: Repository
+        :returns: A :doc:`result`
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+        request = self.make_request('repos.stargazers.list',
+                                    user=user, repo=repo)
+        return self._get_result(request)
+
+    def list_repos(self, user=None):
+        """ Get repositories being starred by a user
+
+        :param str user: Username
+        :returns: A :doc:`result`
+
+        If you call it without user and you are authenticated, get the
+        repositories being starred by the authenticated user.
+
+        .. warning::
+            If you aren't authenticated and call without user, it returns 403
+
+        ::
+
+            stargazers_service.list_repos('copitux')
+            stargazers_service.list_repos()
+        """
+        request = self.request_builder('repos.stargazers.list_repos',
+                                       user=user)
+        return self._get_result(request)
+
+    def is_starring(self, user=None, repo=None):
+        """ Check if authenticated user is starring a repository
+
+        :param str user: Username
+        :param str repo: Repository
+
+        .. note::
+            Remember :ref:`config precedence`
+
+        .. warning::
+            You must be authenticated
+        """
+        request = self.make_request('repos.stargazers.is_starring',
+                                    user=user, repo=repo)
+        return self._bool(request)
+
+    def star(self, user=None, repo=None):
+        """ Star a repository
+
+        :param str user: Username
+        :param str repo: Repository
+
+        .. note::
+            Remember :ref:`config precedence`
+
+        .. warning::
+            You must be authenticated
+        """
+        request = self.make_request('repos.stargazers.star',
+                                    user=user, repo=repo)
+        self._put(request)
+
+    def unstar(self, user=None, repo=None):
+        """ Stop starring a repository
+
+        :param str user: Username
+        :param str repo: Repository
+
+        .. note::
+            Remember :ref:`config precedence`
+
+        .. warning::
+            You must be authenticated
+        """
+        request = self.make_request('repos.stargazers.unstar',
+                                    user=user, repo=repo)
+        self._delete(request)
diff --git a/pygithub3/services/repos/statuses.py b/pygithub3/services/repos/statuses.py
new file mode 100644
index 0000000..d71b6b4
--- /dev/null
+++ b/pygithub3/services/repos/statuses.py
@@ -0,0 +1,54 @@
+#!/usr/bin/env python
+# -*- encoding: utf-8 -*-
+
+from . import Service
+
+
+class Statuses(Service):
+    """ Consume `Repo Statuses API
+    <http://developer.github.com/v3/repos/statuses>`_ """
+
+    def list(self, sha=None, user=None, repo=None):
+        """ Get repository's collaborators
+
+        :param str sha: Commit's sha
+        :param str user: Username
+        :param str repo: Repository
+        :returns: A :doc:`result`
+
+        .. note::
+            Remember :ref:`config precedence`
+        """
+
+        request = self.make_request('repos.statuses.list',
+                                    sha=sha, user=user, repo=repo)
+        return self._get_result(request)
+
+    def create(self, data, sha, user=None, repo=None):
+        """ Create a status
+
+        :param dict data: Input. See `github statuses doc`_
+        :param str sha: Commit's sha
+        :param str user: Username
+        :param str repo: Repository
+
+        .. note::
+            Remember :ref:`config precedence`
+
+        .. warning::
+            You must be authenticated
+
+        ::
+
+            data = {
+              "state": "success",
+              "target_url": "https://example.com/build/status",
+              "description": "The build succeeded!"
+            }
+            statuses_service.create(data, '6dcb09', user='octocat',
+                repo='oct_repo')
+        """
+
+        request = self.make_request('repos.statuses.create',
+                                    sha=sha, user=user, repo=repo, body=data)
+        return self._post(request)
diff --git a/pygithub3/services/repos/watchers.py b/pygithub3/services/repos/watchers.py
index cdc3624..b193f64 100644
--- a/pygithub3/services/repos/watchers.py
+++ b/pygithub3/services/repos/watchers.py
@@ -6,7 +6,7 @@
 
 class Watchers(Service):
     """ Consume `Watching API
-    <http://developer.github.com/v3/repos/watching>`_ """
+    <http://developer.github.com/v3/repos/subscribers>`_ """
 
     def list(self, user=None, repo=None):
         """ Get repository's watchers
@@ -19,7 +19,7 @@ def list(self, user=None, repo=None):
             Remember :ref:`config precedence`
         """
         request = self.make_request('repos.watchers.list',
-            user=user, repo=repo)
+                                    user=user, repo=repo)
         return self._get_result(request)
 
     def list_repos(self, user=None):
@@ -55,7 +55,7 @@ def is_watching(self, user=None, repo=None):
             You must be authenticated
         """
         request = self.make_request('repos.watchers.is_watching',
-            user=user, repo=repo)
+                                    user=user, repo=repo)
         return self._bool(request)
 
     def watch(self, user=None, repo=None):
@@ -71,7 +71,7 @@ def watch(self, user=None, repo=None):
             You must be authenticated
         """
         request = self.make_request('repos.watchers.watch',
-            user=user, repo=repo)
+                                    user=user, repo=repo)
         self._put(request)
 
     def unwatch(self, user=None, repo=None):
@@ -87,5 +87,5 @@ def unwatch(self, user=None, repo=None):
             You must be authenticated
         """
         request = self.make_request('repos.watchers.unwatch',
-            user=user, repo=repo)
+                                    user=user, repo=repo)
         self._delete(request)
diff --git a/pygithub3/tests/core/test_client.py b/pygithub3/tests/core/test_client.py
index f65fc80..9dc3950 100644
--- a/pygithub3/tests/core/test_client.py
+++ b/pygithub3/tests/core/test_client.py
@@ -1,14 +1,14 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
 import requests
 
 from mock import patch
 
-from pygithub3.tests.utils.core import TestCase
 from pygithub3.core.client import Client
 from pygithub3.exceptions import NotFound, BadRequest, UnprocessableEntity
+from pygithub3.github import Github
 from pygithub3.tests.utils.base import mock_response
+from pygithub3.tests.utils.core import TestCase
 
 
 class TestClient(TestCase):
@@ -24,19 +24,32 @@ def test_set_credentials_with_invalid(self):
         self.c.set_credentials('', '')
         self.assertIsNone(self.c.requester.auth)
 
+    def test_set_oauth_credentials_with_valid(self):
+        self.c.set_oauth_credentials('id', 'secret')
+        self.assertEqual(dict(self.c.requester.params)['client_id'],
+                         'id')
+        self.assertEqual(dict(self.c.requester.params)['client_secret'],
+                         'secret')
+
+    def test_set_credentials_with_invalid(self):
+        self.c.set_oauth_credentials('', '')
+        self.assertIsNone(dict(self.c.requester.params).get('client_id'))
+        self.assertIsNone(dict(self.c.requester.params).get('client_secret'))
+
     def test_set_token_with_valid(self):
         self.c.set_token('tokenize')
-        self.assertEqual(self.c.requester.params['access_token'], 'tokenize')
+        self.assertEqual(dict(self.c.requester.params)['access_token'],
+                         'tokenize')
 
     def test_set_token_with_invalid(self):
         self.c.set_token('')
-        self.assertIsNone(self.c.requester.params.get('access_token'))
+        self.assertIsNone(dict(self.c.requester.params).get('access_token'))
 
     def test_INIT_client_with_another_config_args(self):
         new_c = Client(base_url='url', per_page=10, user='me', repo='myrepo',
                        verbose='stream')
         self.assertEqual(new_c.config['base_url'], 'url')
-        self.assertEqual(new_c.requester.params['per_page'], 10)
+        self.assertEqual(dict(new_c.requester.params)['per_page'], 10)
         self.assertEqual(new_c.user, 'me')
         self.assertEqual(new_c.repo, 'myrepo')
         self.assertEqual(new_c.requester.config['verbose'], 'stream')
@@ -99,3 +112,17 @@ def test_raise_UnprocessableEntity(self, request_method):
         request_method.return_value.status_code = 422
         request_method.return_value.content = {}
         self.assertRaises(UnprocessableEntity, *self.callback)
+
+class TestGithubGlue(TestCase):
+
+    def test_init(self):
+        gh = Github(login='dummy', password='dummy', user='dummy',
+            repo='dummy')
+        self.assertTrue(getattr(gh, '_users', False))
+        self.assertTrue(getattr(gh, '_repos', False))
+        self.assertTrue(getattr(gh, '_gists', False))
+        self.assertTrue(getattr(gh, '_git_data', False))
+        self.assertTrue(getattr(gh, '_pull_requests', False))
+        self.assertTrue(getattr(gh, '_orgs', False))
+        self.assertTrue(getattr(gh, '_issues', False))
+        self.assertTrue(getattr(gh, '_events', False))
diff --git a/pygithub3/tests/core/test_json.py b/pygithub3/tests/core/test_json.py
new file mode 100644
index 0000000..7c0da86
--- /dev/null
+++ b/pygithub3/tests/core/test_json.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+
+from datetime import datetime
+
+from pygithub3.tests.utils.core import TestCase
+from pygithub3.core import json
+
+
+class TestJson(TestCase):
+    """
+    Test dates parse and normalize
+    """
+
+    dict_ = {
+        'date_ok': datetime(2008, 1, 14, 4, 33, 35),
+        'date_fake': 'some_fake',
+        'list': [1, 2, 3],
+        'nested_dict': {'with_date': datetime(2008, 1, 14, 4, 33, 35)},
+    }
+    json_ = '{"date_fake": "some_fake", "list": [1, 2, 3], "date_ok": "2008-01-14T04:33:35Z", "nested_dict": {"with_date": "2008-01-14T04:33:35Z"}}'
+
+    def test_encoder(self):
+        to_json = json.dumps(self.dict_)
+        self.assertEquals(to_json, self.json_)
+
+    def test_decoder(self):
+        to_dict = json.loads(self.json_)
+        self.assertEquals(self.dict_, to_dict)
diff --git a/pygithub3/tests/core/test_result.py b/pygithub3/tests/core/test_result.py
index b32fb3d..7f554ac 100644
--- a/pygithub3/tests/core/test_result.py
+++ b/pygithub3/tests/core/test_result.py
@@ -1,14 +1,11 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
 from mock import Mock
 
-from pygithub3.tests.utils.core import TestCase
 from pygithub3.core.client import Client
 from pygithub3.core.result import smart, normal, base
-from pygithub3.tests.utils.core import (mock_paginate_github_in_GET, request,
-                                        mock_no_paginate_github_in_GET,
-                                        MockPaginate)
+from pygithub3.tests.utils.core import (TestCase, mock_paginate_github_in_GET,
+    request, mock_no_paginate_github_in_GET, MockPaginate)
 
 
 class ResultInitMixin(object):
@@ -23,6 +20,7 @@ def setUp(self):
     def tearDown(self):
         self.resource_loads.reset_mock()  # It mocks class method
 
+
 class TestSmartResultWithPaginate(ResultInitMixin, TestCase):
 
     @property
diff --git a/pygithub3/tests/requests/test_core.py b/pygithub3/tests/requests/test_core.py
index 110f00e..e4ecc32 100644
--- a/pygithub3/tests/requests/test_core.py
+++ b/pygithub3/tests/requests/test_core.py
@@ -1,19 +1,12 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from mock import Mock
-
-from pygithub3.tests.utils.core import TestCase
-from pygithub3.requests.base import Factory, Body, json, Request
 from pygithub3.exceptions import (UriInvalid, RequestDoesNotExist,
-                                  ValidationError, InvalidBodySchema)
-from pygithub3.tests.utils.base import mock_json, DummyRequest
-from pygithub3.tests.utils.requests import (
-    RequestWithArgs, RequestCleanedUri, RequestBodyInvalidSchema,
-    RequestCleanedBody)
-
-json.dumps = Mock(side_effect=mock_json)
-json.loads = Mock(side_effect=mock_json)
+    ValidationError, InvalidBodySchema)
+from pygithub3.requests.base import Factory, Body, Request
+from pygithub3.tests.utils.base import DummyRequest, dummy_json
+from pygithub3.tests.utils.core import TestCase
+from pygithub3.tests.utils.requests import (RequestWithArgs, RequestCleanedUri,
+    RequestBodyInvalidSchema, RequestCleanedBody)
 
 
 class TestFactory(TestCase):
@@ -70,6 +63,7 @@ def test_without_body_and_without_schema(self):
         self.assertIsNone(request.get_body())
 
 
+@dummy_json
 class TestRequestBodyWithSchema(TestCase):
 
     def setUp(self):
diff --git a/pygithub3/tests/resources/test_core.py b/pygithub3/tests/resources/test_core.py
index d8b8541..568edf4 100644
--- a/pygithub3/tests/resources/test_core.py
+++ b/pygithub3/tests/resources/test_core.py
@@ -1,15 +1,15 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
 from datetime import datetime
 
-from pygithub3.tests.utils.core import TestCase
+from pygithub3.core import json
 from pygithub3.resources.base import Raw
+from pygithub3.tests.utils.core import TestCase
 from pygithub3.tests.utils.resources import Nested, Simple, HasSimple
 
 simple_resource = dict(type='simple')
 has_simple = dict(type='has_simple', simple=simple_resource)
-github_return = dict(
+github_dict = dict(
     id=1,
     name='name_test',
     date='2008-01-14T04:33:35Z',
@@ -17,10 +17,11 @@
     list_collection=[has_simple] * 2,
     items_collections=dict(arg1=has_simple, arg2=has_simple)
 )
-github_return_nested = github_return.copy()
-github_return.update({'self_nested': github_return_nested})
-github_return.update({'self_nested_list': [github_return_nested] * 2})
-github_return.update({'self_nested_dict': dict(arg1=github_return_nested)})
+github_dict_nested = github_dict.copy()
+github_dict.update({'self_nested': github_dict_nested})
+github_dict.update({'self_nested_list': [github_dict_nested] * 2})
+github_dict.update({'self_nested_dict': dict(arg1=github_dict_nested)})
+github_return = json.dumps(github_dict)
 
 
 class TestResourceMapping(TestCase):
@@ -61,8 +62,7 @@ def test_SELF_nested_in_collections(self):
 
 
 class TestRawResource(TestCase):
-    """ Litle obvious :P """
 
     def test_return_original_copy(self):
         self.r = Raw.loads(github_return)
-        self.assertEqual(id(self.r), id(github_return))
+        self.assertEqual(self.r['id'], github_dict['id'])
diff --git a/pygithub3/tests/resources/test_issues.py b/pygithub3/tests/resources/test_issues.py
new file mode 100644
index 0000000..ae572af
--- /dev/null
+++ b/pygithub3/tests/resources/test_issues.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+# -*- encoding: utf-8 -*-
+
+from unittest import TestCase
+
+from pygithub3.resources.issues import Label
+
+
+class TestLabel(TestCase):
+    def test_is_valid_color(self):
+        valid_colors = ['BADa55', 'FF42FF', '45DFCA']
+        for color in valid_colors:
+            self.assertTrue(Label.is_valid_color(color))
+
+        invalid_colors = ['BDA55', '#FFAABB', 'FFf']
+        for color in invalid_colors:
+            self.assertFalse(Label.is_valid_color(color))
diff --git a/pygithub3/tests/services/test_core.py b/pygithub3/tests/services/test_core.py
index bd95b34..9d40d85 100644
--- a/pygithub3/tests/services/test_core.py
+++ b/pygithub3/tests/services/test_core.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-import requests
+from datetime import datetime
 
+import requests
 from mock import patch
 
 from pygithub3.tests.utils.core import TestCase
@@ -27,7 +28,7 @@ def test_BOOL(self, request_method):
 
     def test_PUT(self, request_method):
         self.s._put(self.r, **self.args)
-        data = ''  # See _put
+        data = 'PLACEHOLDER'  # See _put
         request_method.assert_called_with('put', _('dummyrequest'),
                                           data=data, params=self.args)
 
diff --git a/pygithub3/tests/services/test_events.py b/pygithub3/tests/services/test_events.py
new file mode 100644
index 0000000..3d2c674
--- /dev/null
+++ b/pygithub3/tests/services/test_events.py
@@ -0,0 +1,102 @@
+# -*- encoding: utf-8 -*-
+
+import requests
+from mock import patch
+
+from pygithub3.tests.utils.core import TestCase
+from pygithub3.services.events import Event
+from pygithub3.tests.utils.base import (mock_response_result, dummy_json)
+from pygithub3.tests.utils.services import _
+
+
+@dummy_json
+@patch.object(requests.sessions.Session, 'request')
+class TestEventsService(TestCase):
+
+    def setUp(self):
+        self.events = Event()
+
+    def test_LIST(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.events.list().all()
+        self.assertEqual(request_method.call_args[0], ('get', _('events')))
+
+
+@dummy_json
+@patch.object(requests.sessions.Session, 'request')
+class TestRepoEventsService(TestCase):
+
+    def setUp(self):
+        self.events = Event()
+
+    def test_LIST(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.events.repos.list(user='octocat', repo='octocat_repo').all()
+        self.assertEqual(request_method.call_args[0],
+                         ('get', _('repos/octocat/octocat_repo/events')))
+
+
+@dummy_json
+@patch.object(requests.sessions.Session, 'request')
+class TestNetworkEventsService(TestCase):
+
+    def setUp(self):
+        self.events = Event()
+
+    def test_LIST(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.events.networks.list(user='octocat', repo='octocat_repo').all()
+        self.assertEqual(request_method.call_args[0],
+                         ('get', _('networks/octocat/octocat_repo/events')))
+
+
+@dummy_json
+@patch.object(requests.sessions.Session, 'request')
+class TestOrgsEventsService(TestCase):
+
+    def setUp(self):
+        self.events = Event()
+
+    def test_LIST(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.events.orgs.list(org='acme').all()
+        self.assertEqual(request_method.call_args[0],
+                         ('get', _('orgs/acme/events')))
+
+
+@dummy_json
+@patch.object(requests.sessions.Session, 'request')
+class TestUserEventsService(TestCase):
+
+    def setUp(self):
+        self.events = Event()
+
+    def test_LIST_received(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.events.users.list_received(user='octocat').all()
+        self.assertEqual(request_method.call_args[0],
+                         ('get', _('users/octocat/received_events')))
+
+    def test_LIST_received_public(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.events.users.list_received_public(user='octocat').all()
+        self.assertEqual(request_method.call_args[0],
+                         ('get', _('users/octocat/received_events/public')))
+
+    def test_LIST_performed(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.events.users.list_performed(user='octocat').all()
+        self.assertEqual(request_method.call_args[0],
+                         ('get', _('users/octocat/events')))
+
+    def test_LIST_performed_public(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.events.users.list_performed_public(user='octocat').all()
+        self.assertEqual(request_method.call_args[0],
+                         ('get', _('users/octocat/events/public')))
+
+    def test_LIST_orgs(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.events.users.orgs(user='octocat', org='acme').all()
+        self.assertEqual(request_method.call_args[0],
+                         ('get', _('users/octocat/events/orgs/acme')))
diff --git a/pygithub3/tests/services/test_gists.py b/pygithub3/tests/services/test_gists.py
index 8cf93ed..209dd37 100644
--- a/pygithub3/tests/services/test_gists.py
+++ b/pygithub3/tests/services/test_gists.py
@@ -1,20 +1,16 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
 import requests
-from mock import patch, Mock
+from mock import patch
 
-from pygithub3.tests.utils.core import TestCase
-from pygithub3.resources.base import json
 from pygithub3.services.gists import Gist, Comments
-from pygithub3.tests.utils.base import (mock_response, mock_response_result,
-                                        mock_json)
+from pygithub3.tests.utils.base import (dummy_json, mock_response,
+    mock_response_result)
+from pygithub3.tests.utils.core import TestCase
 from pygithub3.tests.utils.services import _
 
-json.dumps = Mock(side_effect=mock_json)
-json.loads = Mock(side_effect=mock_json)
-
 
+@dummy_json
 @patch.object(requests.sessions.Session, 'request')
 class TestGistService(TestCase):
 
@@ -93,6 +89,7 @@ def test_DELETE(self, request_method):
             ('delete', _('gists/1')))
 
 
+@dummy_json
 @patch.object(requests.sessions.Session, 'request')
 class TestCommentService(TestCase):
 
diff --git a/pygithub3/tests/services/test_git_data.py b/pygithub3/tests/services/test_git_data.py
index da1abf7..93e51f5 100644
--- a/pygithub3/tests/services/test_git_data.py
+++ b/pygithub3/tests/services/test_git_data.py
@@ -1,22 +1,17 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
 import requests
-from mock import patch, Mock
+from mock import patch
 
-from pygithub3.tests.utils.core import TestCase
 from pygithub3.services.git_data import (Blobs, Commits, References, Tags,
-                                         Trees)
-from pygithub3.resources.base import json
-from pygithub3.tests.utils.base import (mock_response, mock_response_result,
-                                        mock_json)
+    Trees)
+from pygithub3.tests.utils.base import (dummy_json, mock_response,
+    mock_response_result)
+from pygithub3.tests.utils.core import TestCase
 from pygithub3.tests.utils.services import _
 
 
-json.dumps = Mock(side_effect=mock_json)
-json.loads = Mock(side_effect=mock_json)
-
-
+@dummy_json
 @patch.object(requests.sessions.Session, 'request')
 class TestBlobsService(TestCase):
     def setUp(self):
@@ -36,6 +31,7 @@ def test_CREATE(self, reqm):
                          ('post', _('repos/octocat/repo/git/blobs')))
 
 
+@dummy_json
 @patch.object(requests.sessions.Session, 'request')
 class TestCommitsService(TestCase):
     def setUp(self):
@@ -62,6 +58,7 @@ def test_CREATE(self, reqm):
         )
 
 
+@dummy_json
 @patch.object(requests.sessions.Session, 'request')
 class TestReferencesService(TestCase):
     def setUp(self):
@@ -107,6 +104,8 @@ def test_delete(self, reqm):
             ('delete', _('repos/user/repo/git/refs/branch'))
         )
 
+
+@dummy_json
 @patch.object(requests.sessions.Session, 'request')
 class TestTagsService(TestCase):
     def setUp(self):
@@ -130,6 +129,7 @@ def test_CREATE(self, reqm):
         )
 
 
+@dummy_json
 @patch.object(requests.sessions.Session, 'request')
 class TestTreesService(TestCase):
     def setUp(self):
diff --git a/pygithub3/tests/services/test_issues.py b/pygithub3/tests/services/test_issues.py
new file mode 100644
index 0000000..17c9616
--- /dev/null
+++ b/pygithub3/tests/services/test_issues.py
@@ -0,0 +1,233 @@
+# -*- encoding: utf-8 -*-
+
+import requests
+from mock import patch
+
+from pygithub3.exceptions import ValidationError
+from pygithub3.services.issues import (Issue, Comments, Events, Labels,
+    Milestones)
+from pygithub3.tests.utils.base import (dummy_json, mock_response,
+    mock_response_result)
+from pygithub3.tests.utils.core import TestCase
+from pygithub3.tests.utils.services import _
+
+
+@dummy_json
+@patch.object(requests.sessions.Session, 'request')
+class TestIssuesService(TestCase):
+
+    def setUp(self):
+        self.isu = Issue(user='octocat', repo='Hello-World')
+
+    def test_LIST_without_user(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.isu.list().all()
+        self.assertEqual(request_method.call_args[0], ('get', _('issues')))
+
+    def test_LIST_by_repo(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.isu.list_by_repo().all()
+        self.assertEqual(request_method.call_args[0],
+            ('get', _('repos/octocat/Hello-World/issues')))
+
+    def test_GET(self, request_method):
+        request_method.return_value = mock_response()
+        self.isu.get(1)
+        self.assertEqual(request_method.call_args[0],
+            ('get', _('repos/octocat/Hello-World/issues/1')))
+
+    def test_CREATE(self, request_method):
+        request_method.return_value = mock_response('post')
+        self.isu.create(dict(title='My issue', body='Fix this issue'))
+        self.assertEqual(request_method.call_args[0],
+            ('post', _('repos/octocat/Hello-World/issues')))
+
+    def test_UPDATE(self, request_method):
+        request_method.return_value = mock_response('patch')
+        self.isu.update(1, {'body': 'edited'})
+        self.assertEqual(request_method.call_args[0],
+            ('patch', _('repos/octocat/Hello-World/issues/1')))
+
+
+@dummy_json
+@patch.object(requests.sessions.Session, 'request')
+class TestCommentService(TestCase):
+
+    def setUp(self):
+        self.cs = Comments(user='octocat', repo='Hello-World')
+
+    def test_LIST(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.cs.list(1).all()
+        self.assertEqual(request_method.call_args[0],
+            ('get', _('repos/octocat/Hello-World/issues/1/comments')))
+
+    def test_GET(self, request_method):
+        request_method.return_value = mock_response()
+        self.cs.get(1)
+        self.assertEqual(request_method.call_args[0],
+            ('get', _('repos/octocat/Hello-World/issues/comments/1')))
+
+    def test_CREATE(self, request_method):
+        request_method.return_value = mock_response('post')
+        self.cs.create(1, 'comment')
+        self.assertEqual(request_method.call_args[0],
+            ('post', _('repos/octocat/Hello-World/issues/1/comments')))
+
+    def test_UPDATE(self, request_method):
+        request_method.return_value = mock_response('patch')
+        self.cs.update(1, 'new comment')
+        self.assertEqual(request_method.call_args[0],
+            ('patch', _('repos/octocat/Hello-World/issues/comments/1')))
+
+    def test_DELETE(self, request_method):
+        request_method.return_value = mock_response('delete')
+        self.cs.delete(1)
+        self.assertEqual(request_method.call_args[0],
+            ('delete', _('repos/octocat/Hello-World/issues/comments/1')))
+
+
+@dummy_json
+@patch.object(requests.sessions.Session, 'request')
+class TestEventsService(TestCase):
+
+    def setUp(self):
+        self.ev = Events(user='octocat', repo='Hello-World')
+
+    def test_LIST_by_issue(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.ev.list_by_issue(1).all()
+        self.assertEqual(request_method.call_args[0],
+            ('get', _('repos/octocat/Hello-World/issues/1/events')))
+
+    def test_LIST_by_repo(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.ev.list_by_repo().all()
+        self.assertEqual(request_method.call_args[0],
+            ('get', _('repos/octocat/Hello-World/issues/events')))
+
+    def test_GET(self, request_method):
+        request_method.return_value = mock_response()
+        self.ev.get(1)
+        self.assertEqual(request_method.call_args[0],
+            ('get', _('repos/octocat/Hello-World/issues/events/1')))
+
+
+@dummy_json
+@patch.object(requests.sessions.Session, 'request')
+class TestLabelsService(TestCase):
+
+    def setUp(self):
+        self.lb = Labels(user='octocat', repo='Hello-World')
+
+    def test_GET(self, request_method):
+        request_method.return_value = mock_response()
+        self.lb.get('bug')
+        self.assertEqual(request_method.call_args[0],
+            ('get', _('repos/octocat/Hello-World/labels/bug')))
+
+    def test_CREATE(self, request_method):
+        request_method.return_value = mock_response('post')
+        self.lb.create(dict(name='bug', color='FF0000'))
+        self.assertEqual(request_method.call_args[0],
+            ('post', _('repos/octocat/Hello-World/labels')))
+
+    def test_CREATE_with_invalid_color(self, request_method):
+        request_method.return_value = mock_response('post')
+        # invalid color
+        with self.assertRaises(ValidationError):
+            args = {'name': 'bug', 'color': 'FF00'}
+            self.lb.create(args)
+
+    def test_UPDATE(self, request_method):
+        request_method.return_value = mock_response('patch')
+        self.lb.update('bug', dict(name='critical', color='FF0000'))
+        self.assertEqual(request_method.call_args[0],
+            ('patch', _('repos/octocat/Hello-World/labels/bug')))
+
+    def test_UPDATE_with_invalid_color(self, request_method):
+        request_method.return_value = mock_response('post')
+        # invalid color
+        with self.assertRaises(ValidationError):
+            args = {'name': 'critical', 'color': 'FF00'}
+            self.lb.update('bug', args)
+
+    def test_DELETE(self, request_method):
+        request_method.return_value = mock_response('delete')
+        self.lb.delete('bug')
+        self.assertEqual(request_method.call_args[0],
+            ('delete', _('repos/octocat/Hello-World/labels/bug')))
+
+    def test_LIST_by_issue(self, request_method):
+        request_method.return_value = mock_response()
+        self.lb.list_by_issue(1)
+        self.assertEqual(request_method.call_args[0],
+            ('get', _('repos/octocat/Hello-World/issues/1/labels')))
+
+    def test_ADD_to_issue(self, request_method):
+        request_method.return_value = mock_response('post')
+        self.lb.add_to_issue(1, ('bug', 'critical'))
+        self.assertEqual(request_method.call_args[0],
+            ('post', _('repos/octocat/Hello-World/issues/1/labels')))
+
+    def test_REMOVE_from_issue(self, request_method):
+        request_method.return_value = mock_response('delete')
+        self.lb.remove_from_issue(1, 'bug')
+        self.assertEqual(request_method.call_args[0],
+            ('delete', _('repos/octocat/Hello-World/issues/1/labels/bug')))
+
+    def test_REPLACE_all(self, request_method):
+        request_method.return_value = mock_response()
+        self.lb.replace_all(1, ['bug', 'critical'])
+        self.assertEqual(request_method.call_args[0],
+            ('put', _('repos/octocat/Hello-World/issues/1/labels')))
+
+    def test_REMOVE_all(self, request_method):
+        request_method.return_value = mock_response('delete')
+        self.lb.remove_all(1)
+        self.assertEqual(request_method.call_args[0],
+            ('delete', _('repos/octocat/Hello-World/issues/1/labels')))
+
+    def test_LIST_by_milestone(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.lb.list_by_milestone(1).all()
+        self.assertEqual(request_method.call_args[0],
+            ('get', _('repos/octocat/Hello-World/milestones/1/labels')))
+
+
+@dummy_json
+@patch.object(requests.sessions.Session, 'request')
+class TestMilestonesService(TestCase):
+
+    def setUp(self):
+        self.mi = Milestones(user='octocat', repo='Hello-World')
+
+    def test_LIST_by_repo(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.mi.list().all()
+        self.assertEqual(request_method.call_args[0],
+            ('get', _('repos/octocat/Hello-World/milestones')))
+
+    def test_GET(self, request_method):
+        request_method.return_value = mock_response()
+        self.mi.get(1)
+        self.assertEqual(request_method.call_args[0],
+            ('get', _('repos/octocat/Hello-World/milestones/1')))
+
+    def test_CREATE(self, request_method):
+        request_method.return_value = mock_response('post')
+        self.mi.create(dict(title='test'))
+        self.assertEqual(request_method.call_args[0],
+            ('post', _('repos/octocat/Hello-World/milestones')))
+
+    def test_UPDATE(self, request_method):
+        request_method.return_value = mock_response('patch')
+        self.mi.update(1, dict(title='test'))
+        self.assertEqual(request_method.call_args[0],
+            ('patch', _('repos/octocat/Hello-World/milestones/1')))
+
+    def test_DELETE(self, request_method):
+        request_method.return_value = mock_response('delete')
+        self.mi.delete(1)
+        self.assertEqual(request_method.call_args[0],
+            ('delete', _('repos/octocat/Hello-World/milestones/1')))
diff --git a/pygithub3/tests/services/test_orgs.py b/pygithub3/tests/services/test_orgs.py
new file mode 100644
index 0000000..be1cfeb
--- /dev/null
+++ b/pygithub3/tests/services/test_orgs.py
@@ -0,0 +1,170 @@
+# -*- encoding: utf-8 -*-
+
+import requests
+from mock import patch
+
+from pygithub3.services.orgs import Org, Members, Teams
+from pygithub3.tests.utils.base import (dummy_json, mock_response,
+    mock_response_result)
+from pygithub3.tests.utils.core import TestCase
+from pygithub3.tests.utils.services import _
+
+
+@dummy_json
+@patch.object(requests.sessions.Session, 'request')
+class TestOrgService(TestCase):
+    def setUp(self):
+        self.org = Org()
+
+    def test_LIST_without_user(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.org.list().all()
+        self.assertEqual(request_method.call_args[0], ('get', _('user/orgs')))
+
+    def test_LIST_with_user(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.org.list('octocat').all()
+        self.assertEqual(request_method.call_args[0],
+                         ('get', _('users/octocat/orgs')))
+
+    def test_GET(self, request_method):
+        request_method.return_value = mock_response()
+        self.org.get('acme')
+        self.assertEqual(request_method.call_args[0], ('get', _('orgs/acme')))
+
+    def test_UPDATE(self, request_method):
+        request_method.return_value = mock_response('patch')
+        self.org.update('acme', {'company': 'ACME Widgets'})
+        self.assertEqual(request_method.call_args[0],
+                         ('patch', _('orgs/acme')))
+
+
+@dummy_json
+@patch.object(requests.sessions.Session, 'request')
+class TestMemberService(TestCase):
+    def setUp(self):
+        self.ms = Members()
+
+    def test_LIST(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.ms.list('acme').all()
+        self.assertEqual(request_method.call_args[0],
+                         ('get', _('orgs/acme/members')))
+
+    def test_IS_MEMBER(self, request_method):
+        request_method.return_value = mock_response()
+        self.ms.is_member('acme', 'octocat')
+        self.assertEqual(request_method.call_args[0],
+                         ('head', _('orgs/acme/members/octocat')))
+
+    def test_REMOVE_MEMBER(self, request_method):
+        request_method.return_value = mock_response('delete')
+        self.ms.remove_member('acme', 'octocat')
+        self.assertEqual(request_method.call_args[0],
+                         ('delete', _('orgs/acme/members/octocat')))
+
+    def test_LIST_PUBLIC(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.ms.list_public('acme').all()
+        self.assertEqual(request_method.call_args[0],
+                         ('get', _('orgs/acme/public_members')))
+
+    def test_IS_PUBLIC_MEMBER(self, request_method):
+        request_method.return_value = mock_response()
+        self.ms.is_public_member('acme', 'octocat')
+        self.assertEqual(request_method.call_args[0],
+                         ('head', _('orgs/acme/public_members/octocat')))
+
+    def test_PUBLICIZE_MEMBERSHIP(self, request_method):
+        request_method.return_value = mock_response()
+        self.ms.publicize_membership('acme', 'octocat')
+        self.assertEqual(request_method.call_args[0],
+                         ('put', _('orgs/acme/public_members/octocat')))
+
+    def test_CONCEAL_MEMBERSHIP(self, request_method):
+        request_method.return_value = mock_response('delete')
+        self.ms.conceal_membership('acme', 'octocat')
+        self.assertEqual(request_method.call_args[0],
+                         ('delete', _('orgs/acme/public_members/octocat')))
+
+
+@dummy_json
+@patch.object(requests.sessions.Session, 'request')
+class TestTeamsService(TestCase):
+    def setUp(self):
+        self.ts = Teams()
+
+    def test_LIST(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.ts.list('acme').all()
+        self.assertEqual(request_method.call_args[0],
+                         ('get', _('orgs/acme/teams')))
+
+    def test_GET(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.ts.get(1)
+        self.assertEqual(request_method.call_args[0], ('get', _('teams/1')))
+
+    def test_CREATE(self, request_method):
+        request_method.return_value = mock_response_result('post')
+        self.ts.create('acme', dict(name='new'))
+        self.assertEqual(request_method.call_args[0],
+                         ('post', _('orgs/acme/teams')))
+
+    def test_UPDATE(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.ts.update(1, dict(name='edited'))
+        self.assertEqual(request_method.call_args[0], ('patch', _('teams/1')))
+
+    def test_DELETE(self, request_method):
+        request_method.return_value = mock_response_result('delete')
+        self.ts.delete(1)
+        self.assertEqual(request_method.call_args[0], ('delete', _('teams/1')))
+
+    def test_LIST_MEMBERS(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.ts.list_members(1).all()
+        self.assertEqual(request_method.call_args[0],
+                         ('get', _('teams/1/members')))
+
+    def test_IS_MEMBER(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.ts.is_member(1, 'octocat')
+        self.assertEqual(request_method.call_args[0],
+                         ('head', _('teams/1/members/octocat')))
+
+    def test_ADD_MEMBER(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.ts.add_member(1, 'octocat')
+        self.assertEqual(request_method.call_args[0],
+                         ('put', _('teams/1/members/octocat')))
+
+    def test_REMOVE_MEMBER(self, request_method):
+        request_method.return_value = mock_response_result('delete')
+        self.ts.remove_member(1, 'octocat')
+        self.assertEqual(request_method.call_args[0],
+                         ('delete', _('teams/1/members/octocat')))
+
+    def test_LIST_REPOS(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.ts.list_repos(1).all()
+        self.assertEqual(request_method.call_args[0],
+                         ('get', _('teams/1/repos')))
+
+    def test_CONTAINS_REPO(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.ts.contains_repo(1, 'octocat', 're_oct')
+        self.assertEqual(request_method.call_args[0],
+                         ('head', _('teams/1/repos/octocat/re_oct')))
+
+    def test_ADD_TEAM_REPO(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.ts.add_repo(1, 'octocat', 're_oct')
+        self.assertEqual(request_method.call_args[0],
+                         ('put', _('teams/1/repos/octocat/re_oct')))
+
+    def test_REMOVE_TEAM_REPO(self, request_method):
+        request_method.return_value = mock_response_result('delete')
+        self.ts.remove_repo(1, 'octocat', 're_oct')
+        self.assertEqual(request_method.call_args[0],
+                         ('delete', _('teams/1/repos/octocat/re_oct')))
diff --git a/pygithub3/tests/services/test_pull_requests.py b/pygithub3/tests/services/test_pull_requests.py
index 4a9fd41..83a1202 100644
--- a/pygithub3/tests/services/test_pull_requests.py
+++ b/pygithub3/tests/services/test_pull_requests.py
@@ -1,22 +1,18 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
 import requests
-from mock import patch, Mock
+from mock import patch
 from nose.tools import raises
 
-from pygithub3.tests.utils.core import TestCase
+from pygithub3.requests.base import ValidationError
 from pygithub3.services.pull_requests import PullRequests, Comments
-from pygithub3.requests.base import ValidationError, json
-from pygithub3.tests.utils.base import (mock_response, mock_response_result,
-                                        mock_json)
+from pygithub3.tests.utils.base import (dummy_json, mock_response,
+    mock_response_result)
+from pygithub3.tests.utils.core import TestCase
 from pygithub3.tests.utils.services import _
 
 
-json.dumps = Mock(side_effect=mock_json)
-json.loads = Mock(side_effect=mock_json)
-
-
+@dummy_json
 @patch.object(requests.sessions.Session, 'request')
 class TestPullRequestsService(TestCase):
     def setUp(self):
@@ -123,6 +119,7 @@ def test_MERGE(self, reqm):
         )
 
 
+@dummy_json
 @patch.object(requests.sessions.Session, 'request')
 class TestPullRequestCommentsService(TestCase):
     def setUp(self):
diff --git a/pygithub3/tests/services/test_repos.py b/pygithub3/tests/services/test_repos.py
index e21d474..56faabb 100644
--- a/pygithub3/tests/services/test_repos.py
+++ b/pygithub3/tests/services/test_repos.py
@@ -1,21 +1,17 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
 import requests
-from mock import patch, Mock
+from mock import patch
 
-from pygithub3.tests.utils.core import TestCase
 from pygithub3.services.repos import (Repo, Collaborators, Commits, Downloads,
-                                      Forks, Keys, Watchers, Hooks)
-from pygithub3.resources.base import json
-from pygithub3.tests.utils.base import (mock_response, mock_response_result,
-                                        mock_json)
+    Forks, Keys, Watchers, Stargazers, Hooks, Statuses)
+from pygithub3.tests.utils.base import (dummy_json, mock_response,
+    mock_response_result)
+from pygithub3.tests.utils.core import TestCase
 from pygithub3.tests.utils.services import _
 
-json.dumps = Mock(side_effect=mock_json)
-json.loads = Mock(side_effect=mock_json)
-
 
+@dummy_json
 @patch.object(requests.sessions.Session, 'request')
 class TestRepoService(TestCase):
 
@@ -82,6 +78,12 @@ def test_GET_with_repo_in_service(self, request_method):
         self.assertEqual(request_method.call_args[0],
                          ('get', _('repos/octocat/octocat_repo')))
 
+    def test_DELETE(self, request_method):
+        request_method.return_value = mock_response('delete')
+        self.rs.delete()
+        self.assertEqual(request_method.call_args[0],
+                         ('delete', _('repos/octocat/octocat_repo')))
+
     def test_UPDATE_with_repo_in_args(self, request_method):
         request_method.return_value = mock_response('patch')
         self.rs.update({'name': 'test'}, user='user', repo='repo')
@@ -108,7 +110,7 @@ def test_LIST_contributors_with_anonymous(self, request_method):
         self.rs.list_contributors_with_anonymous().all()
         self.assertEqual(request_method.call_args[0],
                          ('get', _('repos/octocat/octocat_repo/contributors')))
-        self.assertEqual(request_method.call_args[1]['params']['anom'], True)
+        self.assertEqual(request_method.call_args[1]['params']['anon'], True)
 
     def test_LIST_languages(self, request_method):
         request_method.return_value = mock_response()
@@ -134,7 +136,14 @@ def test_LIST_branches(self, request_method):
         self.assertEqual(request_method.call_args[0],
                          ('get', _('repos/octocat/octocat_repo/branches')))
 
+    def test_GET_branch(self, request_method):
+        request_method.return_value = mock_response()
+        self.rs.get_branch('master')
+        self.assertEqual(request_method.call_args[0],
+            ('get', _('repos/octocat/octocat_repo/branches/master')))
+
 
+@dummy_json
 @patch.object(requests.sessions.Session, 'request')
 class TestCollaboratorsService(TestCase):
 
@@ -167,6 +176,7 @@ def test_DELETE(self, request_method):
             ('delete', _('repos/octocat/oc_repo/collaborators/user')))
 
 
+@dummy_json
 @patch.object(requests.sessions.Session, 'request')
 class TestCommitsService(TestCase):
 
@@ -230,6 +240,7 @@ def test_DELETE_comment(self, request_method):
                          ('delete', _('repos/oct/re_oct/comments/1')))
 
 
+@dummy_json
 @patch.object(requests.sessions.Session, 'request')
 class TestDownloadsService(TestCase):
 
@@ -262,6 +273,7 @@ def test_CREATE(self, request_method):
         self.assertTrue(hasattr(download, 'upload'))
 
 
+@dummy_json
 @patch.object(requests.sessions.Session, 'request')
 class TestForksService(TestCase):
 
@@ -281,6 +293,7 @@ def test_CREATE(self, request_method):
                          ('post', _('repos/oct/re_oct/forks')))
 
 
+@dummy_json
 @patch.object(requests.sessions.Session, 'request')
 class TestKeysService(TestCase):
 
@@ -318,6 +331,7 @@ def test_DELETE(self, request_method):
                          ('delete', _('repos/oct/re_oct/keys/1')))
 
 
+@dummy_json
 @patch.object(requests.sessions.Session, 'request')
 class TestWatchersService(TestCase):
 
@@ -328,38 +342,82 @@ def test_LIST(self, request_method):
         request_method.return_value = mock_response_result()
         self.ws.list().all()
         self.assertEqual(request_method.call_args[0],
-            ('get', _('repos/oct/re_oct/watchers')))
+            ('get', _('repos/oct/re_oct/subscribers')))
 
     def test_LIST_repos(self, request_method):
         request_method.return_value = mock_response_result()
         self.ws.list_repos().all()
         self.assertEqual(request_method.call_args[0],
-            ('get', _('user/watched')))
+            ('get', _('user/subscriptions')))
 
     def test_LIST_repos_with_user(self, request_method):
         request_method.return_value = mock_response_result()
         self.ws.list_repos('oct').all()
         self.assertEqual(request_method.call_args[0],
-            ('get', _('users/oct/watched')))
+            ('get', _('users/oct/subscriptions')))
 
     def test_IS_watching(self, request_method):
         request_method.return_value = mock_response()
         self.assertTrue(self.ws.is_watching())
         self.assertEqual(request_method.call_args[0],
-            ('head', _('user/watched/oct/re_oct')))
+            ('head', _('user/subscriptions/oct/re_oct')))
 
     def test_WATCH(self, request_method):
         self.ws.watch()
         self.assertEqual(request_method.call_args[0],
-            ('put', _('user/watched/oct/re_oct')))
+            ('put', _('user/subscriptions/oct/re_oct')))
 
     def test_UNWATCH(self, request_method):
         request_method.return_value = mock_response('delete')
         self.ws.unwatch()
         self.assertEqual(request_method.call_args[0],
-            ('delete', _('user/watched/oct/re_oct')))
+            ('delete', _('user/subscriptions/oct/re_oct')))
 
 
+@dummy_json
+@patch.object(requests.sessions.Session, 'request')
+class TestStargazersService(TestCase):
+
+    def setUp(self):
+        self.sg = Stargazers(user='oct', repo='re_oct')
+
+    def test_LIST(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.sg.list().all()
+        self.assertEqual(request_method.call_args[0],
+            ('get', _('repos/oct/re_oct/stargazers')))
+
+    def test_LIST_repos(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.sg.list_repos().all()
+        self.assertEqual(request_method.call_args[0],
+            ('get', _('user/starred')))
+
+    def test_LIST_repos_with_user(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.sg.list_repos('oct').all()
+        self.assertEqual(request_method.call_args[0],
+            ('get', _('users/oct/starred')))
+
+    def test_IS_starring(self, request_method):
+        request_method.return_value = mock_response()
+        self.assertTrue(self.sg.is_starring())
+        self.assertEqual(request_method.call_args[0],
+            ('head', _('user/starred/oct/re_oct')))
+
+    def test_STAR(self, request_method):
+        self.sg.watch()
+        self.assertEqual(request_method.call_args[0],
+            ('put', _('user/starred/oct/re_oct')))
+
+    def test_STAR(self, request_method):
+        request_method.return_value = mock_response('delete')
+        self.sg.unstar()
+        self.assertEqual(request_method.call_args[0],
+            ('delete', _('user/starred/oct/re_oct')))
+
+
+@dummy_json
 @patch.object(requests.sessions.Session, 'request')
 class TestHooksService(TestCase):
 
@@ -401,3 +459,25 @@ def test_DELETE(self, request_method):
         self.hs.delete(1)
         self.assertEqual(request_method.call_args[0],
                 ('delete', _('repos/oct/re_oct/hooks/1')))
+
+@dummy_json
+@patch.object(requests.sessions.Session, 'request')
+class TestStatusesService(TestCase):
+
+    def setUp(self):
+        self.ss = Statuses(user='oct', repo='re_oct')
+
+    def test_LIST(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.ss.list(sha='e3bc').all()
+        self.assertEqual(request_method.call_args[0],
+                         ('get', _('repos/oct/re_oct/statuses/e3bc')))
+
+    def test_CREATE(self, request_method):
+        request_method.return_value = mock_response('post')
+        self.ss.create({"state": "success",
+                        "target_url": "https://example.com/build/status",
+                        "description": "The build succeeded!"},
+                       sha='e3bc')
+        self.assertEqual(request_method.call_args[0],
+                         ('post', _('repos/oct/re_oct/statuses/e3bc')))
diff --git a/pygithub3/tests/services/test_users.py b/pygithub3/tests/services/test_users.py
index 317f0d5..7f0c6a1 100644
--- a/pygithub3/tests/services/test_users.py
+++ b/pygithub3/tests/services/test_users.py
@@ -1,22 +1,18 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
 import requests
-from mock import patch, Mock
+from mock import patch
 
-from pygithub3.tests.utils.core import TestCase
 from pygithub3.core.client import Client
-from pygithub3.services.users import User, Emails, Followers, Keys
 from pygithub3.exceptions import ValidationError
-from pygithub3.resources.base import json
-from pygithub3.tests.utils.base import (mock_response, mock_response_result,
-                                        mock_json)
+from pygithub3.services.users import User, Emails, Followers, Keys
+from pygithub3.tests.utils.base import (dummy_json, mock_response,
+    mock_response_result)
+from pygithub3.tests.utils.core import TestCase
 from pygithub3.tests.utils.services import _
 
-json.dumps = Mock(side_effect=mock_json)
-json.loads = Mock(side_effect=mock_json)
-
 
+@dummy_json
 @patch.object(requests.sessions.Session, 'request')
 class TestUserService(TestCase):
 
@@ -43,6 +39,7 @@ def test_UPDATE_without_data(self, request_method):
         self.assertRaises(ValidationError, self.us.update, {})
 
 
+@dummy_json
 @patch.object(requests.sessions.Session, 'request')
 class TestEmailsService(TestCase):
 
@@ -82,6 +79,7 @@ def test_DELETE_without_emails(self, request_method):
         self.assertRaises(ValidationError, self.es.delete)
 
 
+@dummy_json
 @patch.object(requests.sessions.Session, 'request')
 class TestFollowersService(TestCase):
 
@@ -130,6 +128,7 @@ def test_UNFOLLOW(self, request_method):
                          ('delete', _('user/following/octocat')))
 
 
+@dummy_json
 @patch.object(requests.sessions.Session, 'request')
 class TestKeysService(TestCase):
 
diff --git a/pygithub3/tests/utils/base.py b/pygithub3/tests/utils/base.py
index f90b5d3..011f35b 100644
--- a/pygithub3/tests/utils/base.py
+++ b/pygithub3/tests/utils/base.py
@@ -1,14 +1,17 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from mock import Mock
+from mock import Mock, patch
 
+from pygithub3.core import json
 from pygithub3.resources.base import Resource
 from pygithub3.requests.base import Request
 
 
-def mock_json(content):
-    return content
+_dummy_json = lambda x, **kwargs: x
+
+
+def dummy_json(cls):
+    return patch.multiple(json, dumps=_dummy_json, loads=_dummy_json)(cls)
 
 
 def mock_response(status_code='get', content={}):
@@ -26,12 +29,8 @@ def mock_response_result(status_code='get'):
 
 
 class DummyResource(Resource):
-    pass
-
 
-def loads_mock(content):
-    return content
-DummyResource.loads = Mock(side_effect=loads_mock)
+    loads = Mock(side_effect=_dummy_json)
 
 
 class DummyRequest(Request):
diff --git a/pygithub3/tests/utils/resources.py b/pygithub3/tests/utils/resources.py
index be9245b..5a2d066 100644
--- a/pygithub3/tests/utils/resources.py
+++ b/pygithub3/tests/utils/resources.py
@@ -1,14 +1,6 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from mock import Mock
-
-from .base import Resource
-from pygithub3.resources.base import json
-from pygithub3.tests.utils.base import mock_json
-
-json.dumps = Mock(side_effect=mock_json)
-json.loads = Mock(side_effect=mock_json)
+from pygithub3.resources.base import Resource
 
 
 class Simple(Resource):
diff --git a/pygithub3/tests/utils/services.py b/pygithub3/tests/utils/services.py
index 8670f31..a46bb1b 100644
--- a/pygithub3/tests/utils/services.py
+++ b/pygithub3/tests/utils/services.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
 from pygithub3.services.base import Service, MimeTypeMixin
@@ -10,6 +9,7 @@
 def _(request):
     return "%s%s" % (base_url, request)
 
+
 class DummyService(Service, MimeTypeMixin):
 
     def dummy_request(self):
diff --git a/requirements/base.txt b/requirements/base.txt
index f229360..1ff0d4c 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1 +1 @@
-requests
+requests==0.14.0
diff --git a/setup.py b/setup.py
index ad082b9..37062b3 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,18 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
+from os.path import join
+
 from setuptools import setup, find_packages
 import pygithub3
 
+# Odd hack to get 'python setup.py test' working on py2.7
+try:
+    import multiprocessing
+    import logging
+except ImportError:
+    pass
+
 setup(
     name=pygithub3.__name__,
     version=pygithub3.__version__,
@@ -14,7 +23,12 @@
     long_description=open('README.rst').read(),
     license='ISC',
     packages=find_packages(exclude=['*tests*']),
-    install_requires=map(str.strip, open('requirements/base.txt')),
+    test_suite='nose.collector',
+    tests_require=[
+        'nose',
+        'mock',
+    ],
+    install_requires=map(str.strip, open(join('requirements', 'base.txt'))),
     include_package_data=True,
     classifiers=(
         'Programming Language :: Python',
@@ -22,7 +36,7 @@
         'Programming Language :: Python :: 2.7',
         'License :: OSI Approved :: ISC License (ISCL)',
         'Operating System :: OS Independent',
-        'Development Status :: 3 - Alpha',
+        'Development Status :: 2 - Pre-Alpha',
         'Intended Audience :: Developers',
     ),
 )