Squashed commit of the following:

commit eb79c7bb84c1a7000bb4c6054ba75ef70b1cc1a5
Author: M. David Bennett <mdavidbennett@syntheticworks.com>
Date:   Tue Jul 22 11:43:48 2014 -0500

    Cleaned up code

commit f4b5c21f5368450528aa5b805c53b65237da1aa3
Author: M. David Bennett <mdavidbennett@syntheticworks.com>
Date:   Mon Jul 21 14:50:30 2014 -0500

    Fleshed out API.