Maps done in a non-dumb way now