Merge pull request #1 from IWD2013/master

Pull request
added the code I have completed so far.  NOTE: all the comments are still from Aaron's original interfaces
Merge pull request #1 from TomEastwood/master

i'm scared...