Thought I had it all but I was wrong...