Redoing map logic so it's easier to create maps