Haven't done this in the latest commits. Need to give it a bit of a think.