removed almost all of the html generation