Add a long name
Add StateLoadMap
State can now return state instances
Add LoadMap