More progress with upsilon-web2 ;)