Bit of a cleanup.  Beginnings of some real code.
Trying to get travis working.