Scaffolds out support for States. #3