moved in presentation code.  Still needs some polishing