[@Bartimaeus], will accept once complete.