Some more refactoring, stub World implementation
5 files changed