Lets try and fix this some more.  Bring the graphics class back as a group for graphics items.

Change-Id: I1cc18a8b6de3bc4e9eac294b56d8f0093ed18d31