A little bit more work, included the UI graphics from Luis.  Just need some finishing touches