catknap - was sitting on the wip for this for several days but...