My first commit

* You should take this
* It will improve the code base

This may not be ready to go yet. @jakedouglas  could you take a look?