New map/Timer

Added map, but timer still needs fixing