Updated my CreateMap function

made it less messy, I was having a hard time coding it. Now its
completely a switch instead of a combo of ifs and switches