Incorporate some of Robby's ideas