moved more stuff into state