Made map more complex, took out unneeded methods.