Pretty much fixed up mapping w/ regions