I've just pushed something along those lines