envydis/vp1: Lots of new stuff.