Work in progress on improving web site generation