Remove useless State class.
Handle throwing user in jail.
Clear up some FIXME's in the space handling code.\n\nConnect up some methods in the Model.