Commit 3
 * Map generation
 * Rendering refactoring