I should have looked more closely at the title. But FWIW, looks great to me otherwise, once the includes are fixed.