moved stuff into state