diff --git a/bbio/libraries/IoT/__init__.py b/bbio/libraries/IoT/__init__.py
new file mode 100755
index 0000000..cc0ed02
--- /dev/null
+++ b/bbio/libraries/IoT/__init__.py
@@ -0,0 +1,12 @@
+
+try:
+  import requests
+except ImportError:
+  exit("\The IoT library requires the 'requests' package:\n"+\
+       "  # pip install requests\n")
+
+import thingspeak, phant
+
+__all__ = [
+  'thingspeak', 'phant'
+]
\ No newline at end of file
diff --git a/bbio/libraries/PhantStream/phantstream.py b/bbio/libraries/IoT/phant.py
similarity index 100%
rename from bbio/libraries/PhantStream/phantstream.py
rename to bbio/libraries/IoT/phant.py
diff --git a/bbio/libraries/IoT/thingspeak.py b/bbio/libraries/IoT/thingspeak.py
new file mode 100755
index 0000000..c348049
--- /dev/null
+++ b/bbio/libraries/IoT/thingspeak.py
@@ -0,0 +1,84 @@
+"""
+
+"""
+
+import requests, datetime
+
+
+class ThingSpeakChannel(object):
+
+  UPDATE_URL = "https://api.thingspeak.com/update"
+
+  def __init__(self, api_key):
+    self.api_key = api_key
+
+  def post(self, data, coords=None, elevation=None, status='', thingtweet=None, 
+           sample_datetime=None, timezone=''):
+    """ Sends the given data to the channel in the given order starting with
+        field1. """
+    n_fields = len(data)
+    assert n_fields > 0, "At least one field is required"
+    assert n_fields <= 8, "Can't send more than 8 field maximum"
+    
+    params = {'api_key' : self.api_key}
+
+
+    for i in range(0, len(data)):
+        params['field%i' % (i+1)] = data[i]
+
+    if coords:
+      assert type(coords) == tuple or type(coords) == list, \
+              "coords must be tuple or list"
+      assert len(coords) == 2, \
+        "coords must be of length 2: (latitude, longitude)"
+      for i in coords:
+        assert type(i) == int or type(i) == float, \
+                "latitude and longitude must be integers or floats"
+      params['lat'] = float(coords[0])
+      params['long'] = float(coords[1])
+
+    if elevation:
+      assert type(i) == int or type(i) == float, \
+              "elevation must be integer or float"
+      params['elevation'] = int(elevation)
+
+    if status:
+      assert type(status) == str, "status message must be a string"
+      params['status'] = status
+
+    if thingtweet:
+      assert type(thingtweet) == ThingTweet, \
+              "thingtweet must be a ThingTweet instance"
+      params['twitter'] = thingtweet.username
+      params['tweet'] = thingtweet.message
+
+    if sample_datetime:
+      assert type(sample_datetime) == datetime.datetime, \
+              "sample_datetime must be a datetime.datetime object"
+      params['created_at'] = sample_datetime.strftime('%Y-%m-%d %H:%M:%S')
+
+    if timezone:
+      # Do some simple validation, far from thorough!
+      assert type(timezone) == str and \
+             timezone.count('/') == 1 and \
+             timezone[0].isupper() and \
+             timezone[timezone.index('/')+1].isupper() and \
+             tz.count(' ') == 0, \
+              "timezone must be string in IANA time zone format, e.g. America/New_York"
+
+      params['timezone'] = timezone
+
+    response = requests.post(self.UPDATE_URL, params=params)
+    if response.status_code != 200:
+      print "HTTP Error: [%i] - %s" % (response.status_code, response.reason)
+
+
+class ThingTweet(object):
+  def __init__(self, username, message):
+    assert type(username) == str, "Twitter username must be a string"
+    assert type(message) == str, "tweet message must be a string"
+
+    if username[0] == '@': username = username[1:]
+    self.username = username
+    self.message = message
+
diff --git a/bbio/libraries/PhantStream/README.md b/bbio/libraries/PhantStream/README.md
deleted file mode 100644
index 8769771..0000000
--- a/bbio/libraries/PhantStream/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-PhantStream - v0.1
-
-Copyright 2014 Rekha Seethamraju
-rekha.kmit@gmail.com
-
-Library for logging data to the Phant stream hosted on data.sparkfun.com
-or the Beaglebone Black
-
-See documentation here:  
-https://github.com/alexanderhiam/PyBBIO/wiki/PhantStream  
-As well as the included example programs:  
-https://github.com/alexanderhiam/PyBBIO/examples/phant_test.py
-
-PhantStream is released as part of PyBBIO under its MIT license.
-See PyBBIO/LICENSE.txt
diff --git a/bbio/libraries/PhantStream/__init__.py b/bbio/libraries/PhantStream/__init__.py
deleted file mode 100644
index 25297aa..0000000
--- a/bbio/libraries/PhantStream/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from phantstream import PhantStream
\ No newline at end of file
diff --git a/examples/phant_test.py b/examples/phant_test.py
index 6c37d2a..a8ec3f8 100644
--- a/examples/phant_test.py
+++ b/examples/phant_test.py
@@ -23,7 +23,7 @@
 https://github.com/alexanderhiam/PyBBIO/wiki/PhantStream
 '''
 from bbio import *
-from bbio.libraries.PhantStream import *
+from bbio.libraries.IoT.phant import PhantStream
 
 
 pot = AIN0
@@ -43,4 +43,4 @@ def loop():
   p.send(samples)
   delay(10000)
   
-run(setup,loop)
\ No newline at end of file
+run(setup,loop)