Added maps, about to change for Handlebar events