Yeah, this looks a lot cleaner.  @calebthompson what do you think about all this?