State2 -> Handle attributes.  Missed that somehow!@ Doh.