Revision 2

Added world/location/player support.