Continued work on overworld