More state work, refs #32