Moved states to its own file.  This is a test, will create architecture soon.