Merged Ben Balentine's with Jason Kozel

This is pretty quick and dirty, but at least it has the functionality of both of our changes.  From here we can refactor and beautify this beast.