       state:
         current: i.state
         desired: i.desiredState
+    formatInstance = (i) ->
+      _.extend formatInstanceForOverview(i),
+        app:
+          name: i.app?.name
+          version: i.app?.version
+        services: _.mapValues i.services, (s, name) ->
+          state: s.state
+
 
 
     Router.map ->

        where: 'server'
        path: '/api/v2/instances'
      .get ->
        lib.foundJson @response, Instances.find().map formatInstanceForOverview

      @route 'api/v2/instances/single',
        where: 'server'
        path: '/api/v2/instances/:name'
      .get ->
        lib.foundJson @response, Instances.findOne name: @params.name

Meteor.startup ->

  if Meteor.isServer
    _   = require 'lodash'
    lib = require './lib.coffee'

    formatInstanceForOverview = (i) ->
