more MVC into this piece.  Also added view helpers