       source_type: 'external'
       params: paramsFormatted
 
-    toolsFormatted = new Array
-    for toolType, index in tools
-      toolFormatted = 
-        tool_type: toolType
-        name: "#{toolType}-#{index}"
-        data_source: dataSource
-      toolsFormatted.push toolFormatted
+    toolsFormat = @createTools(tools, dataSource)
 
-    @dashboardModel = new DashboardModel
-      name: name.join(' ')
-      project: Manager.get('project')
-      tools: toolsFormatted
+    @dashboardModel = @createDashboard(name, toolsFormat)
 
     @dashboardModel.save().done =>
       @navigateToDashboard()
 
   loadDashboard: (id) =>
     @dashboardModel = new DashboardModel {id: id}
-    @dashboardModel.fetch
-      success: => ToolLoader @dashboardModel, @createDashboardView
+    @dashboardModel.fetch().then
+      => ToolLoader @dashboardModel, @createDashboardView
       error: =>
         delete @dashboardModel
         Manager.get('router').navigate '', {trigger: true}

    unless @savedListView? 
      @savedListView = new SavedList 
        collection: User.current.dashboards
    @appFocusView = @savedListView
    @render()
    User.current.getDashboards()

  showMyData: =>
    unless @myDataView? then @myDataView = new MyData
    @myDataView.loadCollections()
    @appFocusView = @myDataView
    @render()

  navigateToDashboard: (trigger=true) =>

      source_type: 'external'
      params: params

    toolset = Toolsets.projects[Manager.get('project')].defaults
    tools = @createTools(toolset, dataSource, settings)

    @dashboardModel = @createDashboard(name, tools)
    
    @dashboardModel.save().done =>
      @navigateToDashboard()
