refactoring, adding dev console changes for state