A ton of changes to the new version. Map now goes full