Twiddling with graphics again, still don't work but more coupled to the correct objects (i think)