Ub v0 merge stab4

This contains all the -stab2 stuff as well; I rebased some of my commits under yours in -stab3, and have renamed as -stab4.