Added map loading and generation