Added Jareds changes
Cleaned up a few API issues.
Merge branch 'jared-master'
All four group members Unit test present.