Updated and built out remaining state class implementation