Tested all untested features ... worthy a alpha_0.7 tag