Changed a thing to a map
Multimethooooooods