continuing major refactoring, need to revist state utility