0.0.3-1r1: More progress, test is pain in the butt, still good.