Changes so far for monster, not working yet. Also update to map