New SGPstateData for CA and WA, plus Damian's additions