Refactored a little.  Going to do some more.