ok, const-ness everywhere now, it wasn't anywhere near as hard as I 1st thought :)