Refactored Resources to proper base classes.  Land is next!  Hopefully