Things work-ish, removed unused things. Don't make the map to big.