Threw in more stuff to get it working.  Now I just need to clean stuff
up and re-factor a little so that everything makes more sense.