   # Fires the standup message.
 
   doStandup = (room) ->
-    message = PREPEND_MESSAGE + _.sample(STANDUP_MESSAGES)
+    standups = getStandupsForRoom(room)
+    if standups.length > 0
+      #do some magic here to loop through the standups and find the one for right now
+      theStandup = standups.filter(standupShouldFire)
+      message = "#{PREPEND_MESSAGE} #{_.sample(STANDUP_MESSAGES)} #{theStandup[0].location}"
+    else
+      message = "#{PREPEND_MESSAGE} #{_.sample(STANDUP_MESSAGES)} #{standups[0].location}"
     robot.messageRoom room, message
     return
 

    saveStandup room, time, utc
    msg.send 'Ok, from now on I\'ll remind this room to do a standup every weekday at ' + time + ' UTC' + utc
    return
  robot.respond /list standups$/i, (msg) ->
    standups = getStandupsForRoom(findRoom(msg))
    if standups.length == 0
      msg.send 'Well this is awkward. You haven\'t got any standups set :-/'

      ))
      msg.send standupsText.join('\n')
    return
  robot.respond /(?:list|show) standups (?:for|in) every room/i, (msg) ->
    standups = getStandups()
    if standups.length == 0
      msg.send 'No, because there aren\'t any.'
