@Gabi - thanks for this. We haven't been concerned about ODD so far.

My son will meet with the psychologist on Monday - she has a play room and this sounds good to him.