WelcomeTab: Enabling using of HTTPS for RSS download for Linux

WelcomeTab: Final UI adjustments
Update README.md
2019-03-22 10:20:47 +03:00 · 2019-03-22 10:20:05 +03:00 · 2019-03-18 16:19:13 +03:00 · 2019-03-18 16:18:00 +03:00 · 2019-03-18 16:14:35 +03:00 · 2019-03-18 15:47:23 +03:00
3591 changed files with 231686 additions and 816102 deletions
@@ -96,3 +96,4 @@ Desktop.ini

 # Recycle Bin used on file shares
 $RECYCLE.BIN/
+.vscode/settings.json
@@ -0,0 +1,16 @@
+os:
+  - linux
+  # - osx
+  # - windows
+
+dist: xenial
+sudo: require
+language: cpp
+
+script:
+  - bash bin/clean
+  - bash bin/configure 
+  # - bash bin/build
+  # - bash bin/run-unit-tests 
+
+# end of file
@@ -1,30 +1,243 @@
-0.9.0-RC6 / February 13, 2016
+
+Latest Version: 
+Robo 3T 1.3.1 (TBD, 2019)
+http://blog.robomongo.org/robo-3t-1-3
+https://robomongo.org/download
+
+  New Features:
+	- Biggest change in this version is Mongo Shell version upgrade from 3.4 to 4.0.5.
+	- Support for importing from DNS SRV based MongoDB connection strings
+	- Query results windows now supports tabbed output #1591 #1403
+	- Adding support for SCRAM-SHA-256 auth mechanism #1569
+	- Support for Ubuntu 18.04 and Mac 10.14.
+	- Support for creating version 4 UUID #1554
+
+  Improvements
+    - Encrypted passwords are used in config. file instead of clear text passwords 
+	- Showing much better error reason string from Mongo drivers for connection failures
+
+  Fixes:
+	- Broken create/edit/view user features fixed and updated #638 #1041
+	- Attempt to fix #1547: Crash when right click on existing results plus a new long running query
+	- Fix for application crash when adding index with invalid JSON
+	- 'Repair Database' in Robo3T needs a confirm dialog box #1568
+	- Robo 3T the input space causes connection failure #1551
+	- Crash when loading results + right click #1547
+	- Attempt to fix major connection problems seen with the second edit/add/remove document
+	  operation after MongoDB 4.0 upgrade #1603
+	- Attempt to fix #1581: For CRUD ops showing progress bar and disabling context menu while 
+	  waiting for edit op to finish
+	- Fixing UI issue where Functions folder freezing with "Functions..." when fails to refresh
+	- Fix for #1529: Pagination does not work when the aggregation queries have dotted fields
+
+Robo 3T 1.3.0 Beta (16 Feb, 2019)
+Details: https://github.com/Studio3T/robomongo/releases/tag/v1.3.0-beta
+
+Robo 3T 1.2.1 (19 Feb, 2018)   
+http://blog.robomongo.org/robo-3t-1-2
+    
+  Fixes:
+    - Aggregate query results are not pagaeble 
+    - Big double numbers are showing incorrectly #1447
+    - Editing a document from a projection causes data loss (override) (#881)
+    - Error: Resources temporarily unavailable. Error when starting up SSH session: -8 #1426
+    - robo3t 1.1 failed to start on Ubuntu 17.04 #1385
+    - Robo 3T is not opening on MacOS High Sierra (#1412)
+    - Cannot load list of indexes #1454
+    - Robo 3T is not buildable on latest MacOS High Sierra
+	
+  Improvements 
+    - Qt version upgraded from Qt 5.7.0 to Qt 5.9.3
+    - Auto switch to HTTP from HTTPS if the program crashes due to HTTPS related operations 
+    - Improvements for Robo 3T is crashing constantly on High Sierra #1412
+    - PR: Improved query time formatting (#1358) #1455
+            
+Robo 3T 1.2.0 Beta (18 Dec, 2017)   
+https://github.com/Studio3T/robomongo/releases/tag/v1.2.0-beta
+    
+  Improvements & Fixes:
+    - Qt version upgraded from Qt 5.7.0 to Qt 5.9.3
+    - Fix for "Cannot load list of indexes #1454"
+    - Improvements for Robo 3T is crashing constantly on High Sierra #1412
+    - PR: Improved query time formatting (#1358) #1455
+    - Fix for "Robo 3T is not buildable on latest MacOS vesion High Sierra"
+    - Fix attempt for "Error: Resources temporarily unavailable. Error when starting up SSH session: -8 #1426"
+    - Fix for "robo3t 1.1 failed to start on Ubuntu 17.04 #1385"      
+      
+Robo 3T 1.1 (13 June, 2017)
+http://blog.robomongo.org/robomongo-1-1/
+
+  New Features:
+    - MongoDB 3.4 support
+    - New NumberDecimal (Decimal128) data type support
+    - ECMAScript 2015 aka ES6 Support (Modernized JavaScript Implementation)
+    - Re-naming from Robomongo to Robo 3T
+
+  Improvements & Fixes:
+    - Stability Improvements: Fix included to prevent a crash on MACOS Sierra
+    - Shell timeout is configurable on UI now 'Options->Change Shell Timeout'
+    - Fix for Robomongo Shell Timeout Issue (silently, prematurely finishing long lasting scripts) 
+    - Security Improvements: OpenSSL version upgrade to openssl-1.0.1u (22-Sep-2016)
+    - Tool chain upgrades: Modern C++14 features are enabled and usable for developers
+              
+Robomongo 1.1 Beta (12 May, 2017)   
+https://github.com/Studio3T/robomongo/releases/tag/v1.1.0-beta
+    
+  New Features:
+    - MongoDB 3.4 Support 
+    - New NumberDecimal (Decimal128) data type support
+    - ECMAScript 2015 (Modernized JavaScript Implementation aka ES6) Support  
+      
+  Improvements:
+    - Security Improvements: OpenSSL version upgrade to openssl-1.0.1u (22-Sep-2016)
+    - Tool Chain Improvements: Modern C++14 features are enabled 
+
+Robomongo 1.0 (21 Apr, 2017)
+http://blog.robomongo.org/robomongo-1-0
+    
+  New Features:
+    - Update Notifications Bar
+    - Welcome Tab
+    - Welcome Wizard
+
+  Improvements:
+    - Replica set name configurable on UI
+    - Configuration file system location change
+    - "About Robomongo" dialog changes
+  
+  Fixes:
+    - Fix to avoid the same set name problem (https://github.com/Studio3T/robomongo/issues/1302)
+    - Timestamp value is represented incorrectly (https://github.com/Studio3T/robomongo/issues/1159)
+    - Local Timezone shows wrong date (https://github.com/Studio3T/robomongo/issues/501)
+    - Time zone shown as "000:00" when UTC +00:00 is used as local timezone(https://github.com/Studio3T/robomongo/issues/1309)
+  
+Robomongo 1.0-RC1 (1 Feb, 2017)
+http://blog.robomongo.org/robomongo-1-rc1/
+    
+  New Features:
+    - Replica set support.
+    - New 'Attributes' column in connections list window showing connection properties such as 'Replica Set', 'SSL' and 'SSH'.  
+    - New operation logging for almost all operations.
+
+  Improvements:
+    - Improved error handling (no double error windows) for all fail and success conditions for the following operations:
+      . Create, Drop Database
+      . Create, Edit User
+      . Create, Drop, Duplicate, Rename Collection
+      . Insert Document
+      . Remove document, Delete document, Remove all documents (triggered both from explorer and from result widget)
+      . Refresh Users
+      . Refresh Functions
+      . Refresh Collections
+      . Connection establish & refresh server fail and success cases.
+    - Windows size is saved and restored for Edit, View and Insert Document dialogs.
+    - Connections are automatically imported from the latest Robomongo version.
+    - Better error reporting/handling and logging have been added for the operations below:
+      . Create, Drop Function
+      . Drop User
+    - More informative and adjusted log level prefix strings haven added for log window. (Error, Warn, Info etc..).
+    - After a new connection is created, now the focus goes to the newly created connection (end of list) instead of the 
+      beginning of connections list. And when Robomongo is opened, the focus goes to the end of the connection list instead 
+      of beginning. 
+    - Error messages added and error handling for 'remove document', 'remove all documents' operations triggered explorer 
+      and single or multi 'delete document' from results window have been re-implemented and improved.
+    - Relevant errors are shown for the following cases now:        
+      . Drop attempt of non-existing collection.
+      . Duplicating a collection with a collection name which already exists finishes silently.
+  
+  Fixes:
+    - Fix for the problem where the connections list comes empty if the Robomongo config file or it's directory do not exist.
+    - Fix for the problem where 'in-progress bar' widget was not centered on main window for "Update Documents/Remove Documents" 
+      operations. https://github.com/paralect/robomongo/issues/1256
+    - Fix for two problems where the operations 'insert or update documents' in one tab was causing auto reloading of other 
+      unrelated tabs and also multiple error windows to popup. https://github.com/paralect/robomongo/issues/1236
+    - Fix for the problem where the operations 'remove document', 'remove all documents' triggered explorer and single or 
+      multi 'delete document' from results window were causing auto reloading of other unrelated tabs.
+        
+      
+Robomongo 0.9:
+  Major Features: 
+    - Support for MongoDB 3.x and WiredTiger engine. Robomongo now embeds MongoDB 3.2 shell. 
+      (Ability to use the latest shell functionality)
+    - SSH tunnel support for connections
+    - SSL support 
+    - MongoDB Atlas (Cloud MongoDB) support
+    - Both MONGODB-CR and SCRAM-SHA-1 authentication mechanisms are supported. 
+    - Allow direct connections to Replica Set members and support IPv6 protocol. 
+    - Loading of huge list of collections is now faster.
+    - Create Collection dialog is now expandable to support all advanced options.
+      (Supporting all major mongoDB versions 3.2, 3.0, 2.6 and all storage engine types (WiredTiger 
+      and MMAPV1) is added.) 
+    - Windows High DPI support.
+    - Full size editor with dockable output window.
+    
+  Fixed:
+    - Incorrect representation of floating-point numbers (fixed since RC3). This bug was a reason of a big number of issues:
+      #910, #748, #697, #699, #760, #815, #870, #892, 
+      #894, #905, #945, #974, #978, #990, #831, #842
+    - SSH connection failure to servers on Ubuntu and OS X with the following error:
+      "Resource temporarily unavailable. Error when starting up SSH session: -8"  (#1090)     
+      
+  What's new in 0.9.0 Final (30 Sep, 2016)
+  http://blog.robomongo.org/robomongo-0-9-0-final/
+  
+    New Features:
+      - Full size editor with dockable output window.
+      - New JSON object context menu items: "Copy Name" and "Copy Path" are added.
+      - New database context menu items: "Current Operations" and "Kill Operation" are added.
+      - Minimize to Tray Icon for Windows.
+        
+    Other Changes
+      - Cloud platforms Compose, mLab and Amazon EC2 were tested and added as supported platforms.
+      - Maximize/Restore result button behavior and icon have been improved.
+      - For better code quality and code reviews, Robomongo Code Quality and Robomongo Code Review pages have been created.
+        https://github.com/paralect/robomongo/wiki/Robomongo-Code-Review
+        https://github.com/paralect/robomongo/wiki/Robomongo-Code-Quality
 
-  Most important changes: support for MongoDB 3.x and WiredTiger engine. Robomongo 
-  now embeds MongoDB 3.2 shell. It means that you can now use the latest
-  shell functionality. Both MONGODB-CR and SCRAM-SHA-1 authentication mechanisms are
-  supprted. Also, we now allow direct connections to Replica Set members and 
-  support IPv6 protocol. Loading of huge list of collections is now faster.
+  What's new in RC10 (Aug 8, 2016)
+  http://blog.robomongo.org/robomongo-rc10/
+  
+    New Features:
+      - SSL connections with advanced options are now supported.
+      - MongoDB Atlas (Cloud MongoDB) is supported.
+      - Cross Platform High DPI enhancements. 
+    
+    Enhancements:
+      - For better security, OpenSSL has been upgraded to OpenSSL 1.0.1p.
+      - Qt has been updated from Qt 5.5 to latest Qt 5.7. With this update there are many 
+        enhancements including cross platform High DPI support.

-  Fixed incorrect representation of floating-point numbers (fixed since RC3).
-  This bug was a reason of a big number of issues:
-
-     #910, #748, #697, #699, #760, #815, #870, #892, 
-     #894, #905, #945, #974, #978, #990, #831, #842
-
-  What's new in RC7 (March 4, 2016 )
+  What's new in RC9 (May 30, 2016)
+  http://blog.robomongo.org/robomongo-rc9/
+  
+    New Features:
+      - Create Collection dialog with advanced options.
+      - New feature has been added to save/restore window sizes. (#1102)
+      - Connection settings from previous versions of Robomongo are 
+        now automatically imported starting from Robomongo 0.9.0 RC9. (#1086)
+      - Support for querying documents by UUIDs is added, both in legacy and new encoding. (#432)
+       
+    Fixed:
+      - SSH connection failure to servers on Ubuntu and OS X with the following error:
+        "Resource temporarily unavailable. Error when starting up SSH session: -8"  (#1090)
+      - Correct handling of create/drop of databases and collections. (#1083)
+    
+  What's new in RC8 (April 14, 2016)
+  http://blog.robomongo.org/robomongo-rc8/
+     
+  What's new in RC7 (March 4, 2016)
  http://blog.robomongo.org/robomongo-rc7

-  What's new in RC6 (February 13, 2016 )
+  What's new in RC6 (February 13, 2016)
  http://blog.robomongo.org/ipv6-protocol

-  What's new in RC5 (February 8, 2016 )
+  What's new in RC5 (February 8, 2016)
  http://blog.robomongo.org/campaign-is-over-robomongo-is-not/

-  What's new in RC4 (February 1, 2016 )
+  What's new in RC4 (February 1, 2016)
  http://blog.robomongo.org/robomongo-rc4

-  What's new in RC3 (January 29, 2016 )
+  What's new in RC3 (January 29, 2016)
  http://blog.robomongo.org/robomongo-0-9-0-rc3-released

  What's new in RC2 (January 26, 2016)
@@ -86,7 +299,7 @@
  * [Andres Kievsky]
    - Added new app icon in a variety of png and iDraw formats (#693)
  * [Michael Steinacher]
-	- Retina text display support (#724)
+    - Retina text display support (#724)

 0.8.4 / November 27, 2013

@@ -5,12 +5,16 @@ project(Robomongo)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")

 # Project version
-set(PROJECT_VERSION_MAJOR "0")
-set(PROJECT_VERSION_MINOR "9")
-set(PROJECT_VERSION_PATCH "0")
-set(PROJECT_VERSION_BUILD "-RC7")
+set(PROJECT_VERSION_MAJOR "1")
+set(PROJECT_VERSION_MINOR "3")
+set(PROJECT_VERSION_PATCH "1")
+set(PROJECT_VERSION_BUILD "")
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${PROJECT_VERSION_BUILD}")

+# Enable C++14 features 
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 # Modules
 include(RobomongoPrintUtils)
 include(RobomongoCMakeDefaults)
@@ -27,20 +31,28 @@ find_package(Qt5Core REQUIRED)
 find_package(Qt5Gui REQUIRED)
 find_package(Qt5Widgets REQUIRED)
 find_package(Qt5PrintSupport REQUIRED)
+find_package(Qt5Network REQUIRED)
+find_package(Qt5Xml REQUIRED)
 find_package(MongoDB REQUIRED)
+find_package(OpenSSL REQUIRED)

 if (SYSTEM_MACOSX)
+    set(CMAKE_OSX_DEPLOYMENT_TARGET 10.11)
    find_package(Qt5MacExtras REQUIRED)
 endif()

+# todo: Use equivalent vars from googletest cmake files. Currently they are somehow not working.
+set(GOOGLE_TEST_VERSION 1.8.1)
+set(GOOGLE_TEST_DIR src/third-party/googletest-${GOOGLE_TEST_VERSION})
+
 # Projects
-add_subdirectory(src/third-party/openssl)
 add_subdirectory(src/third-party/libssh2)
 add_subdirectory(src/robomongo/ssh)
 add_subdirectory(src/third-party/qjson)
 add_subdirectory(src/third-party/qscintilla)
+add_subdirectory(${GOOGLE_TEST_DIR})
 add_subdirectory(src/robomongo)
+add_subdirectory(src/robomongo-unit-tests)

 # Show configuration summary
-include(RobomongoConfigurationSummary)
-
+include(RobomongoConfigurationSummary)
@@ -1,11 +1,11 @@
-Robomongo, shell-centric cross-platform MongoDB management tool.
+Robo 3T, shell-centric cross-platform MongoDB management tool.

-Copyright 2013, Paralect.
+Copyright 2014-2017 3T Software Labs Ltd.

-The Robomongo is released under the terms of the GNU General Public
+The Robo 3T is released under the terms of the GNU General Public
 License, version 3.

-The Robomongo Project includes files written by third parties
+The Robo 3T Project includes files written by third parties
 and used with permission or subject to their respective license
 agreements.

@@ -1,3 +1,3 @@
-Robomongo is a shell-centric cross-platform open source MongoDB management
+Robo 3T is a shell-centric cross-platform open source MongoDB management
 tool (i.e. Admin GUI). Robomongo embeds the same JavaScript engine that
 powers MongoDB's mongo shell.
@@ -1,67 +1,113 @@
-About Robomongo
+About Robo 3T
 ===============

-[Robomongo](http://www.robomongo.org) is a shell-centric cross-platform MongoDB management tool. Unlike most other MongoDB admin UI tools, Robomongo embeds the actual `mongo` shell in a tabbed interface with access to a shell command line as well as GUI interaction.
+[Robo 3T](http://www.robomongo.org) (formerly Robomongo *) is a shell-centric cross-platform MongoDB management tool. Unlike most other MongoDB admin UI tools, Robo 3T embeds the actual `mongo` shell in a tabbed interface with access to a shell command line as well as GUI interaction.

-Starting from version 0.9, Robomongo is compatibile with MongoDB 3.x (including SCRAM-SHA-1 auth and support for WiredTiger storage engine). Robomongo 0.9 embeds the **MongoDB 3.2** shell.
+From version 1.3, Robo 3T embeds the **MongoDB 4.0** shell (including support for SCRAM-SHA-256 auth and MongoDB SRV connection strings).

-Robomongo 0.8.x embeds the **MongoDB 2.4.0** shell.
+**MongoDB shell history:**   
+From version 1.1, Robo 3T embeds the **MongoDB 3.4** shell.  
+From version 0.9, Robo 3T embeds the **MongoDB 3.2** shell (including SCRAM-SHA-1 auth and support for WiredTiger storage engine).  
+From version 0.8.x, Robo 3T embeds the **MongoDB 2.4.0** shell.  

+\* [Robomongo has been acquired by 3T](https://studio3t.com/press/3t-software-labs-acquires-robomongo-the-most-widely-used-mongodb-tool/)
+
+What's new in latest Robo 3T 1.3?
+====================================
+
+New Features:  
+  - Mongo Shell upgrade from version 3.4 to 4.0.5  
+  - Support for importing from MongoDB SRV connection strings   
+  - Query results window now supports tabbed output ([#1591](https://github.com/Studio3T/robomongo/issues/1591),  [#1403](https://github.com/Studio3T/robomongo/issues/1403))
+  - Adding support for SCRAM-SHA-256 auth mechanism ([#1569](https://github.com/Studio3T/robomongo/issues/1569))  
+  - Support for creating version 4 UUID ([#1554](https://github.com/Studio3T/robomongo/issues/1554))  
+  - Support for Ubuntu 18.04 and Mac 10.14 ([#731](https://github.com/Studio3T/robomongo/issues/731))  
+  
+Bug Fixes:  
+  - 'Create/Edit/View User' features fixed and updated #638 #1041  
+  - Pagination does not work when the aggregation queries have dotted fields #1529   
+  - Fix for application crash when adding index with invalid JSON  
+  - 'Repair Database' in Robo3T needs a confirm dialog box #1568  
+  - Robo 3T the input space causes connection failure #1551  
+  - Crash on right click when loading results #1547  
+  - Attempt to fix #1581: For CRUD ops showing progress bar and disabling context menu while waiting for edit op to finish  
+  - Fixing UI issue where Functions folder freezing with "Functions..." when fails to refresh  
+  - Attempt to fix #1547: Crash when right click on existing results plus a new long running query  
+
+Blog:     http://blog.robomongo.org/robo-3t-1-3/  
+Download: https://robomongo.org/download  
+Watch: [Robo 3T Youtube channel](https://www.youtube.com/channel/UCM_7WAseRWeeiBikExppstA)  
+Follow: https://twitter.com/Robomongo
+
+Supported Platforms
+===============
+
+Note: This sections is for Robo 3T and it directly depends on what MongoDB suppports  
+(See: https://docs.mongodb.com/manual/administration/production-notes/#prod-notes-supported-platforms)
+
+| MongoDB Versions      |
+| :-------------------- |
+| 4.0                   |
+| 3.4                   |
+| 3.2                   |
+| 3.0                   |
+
+| MongoDB Cloud Platforms|
+| :------------ |
+| MongoDB Atlas |
+| Compose       |
+| mLab          |
+| ObjectRocket  | 
+| ScaleGrid     |
+| Amazon EC2    |
+
+| Windows                |   Mac                            | Linux                       |        
+|:---------------------- | :--------------------------------| :---------------------------|
+| Windows 64-bit 10      |  Mac OS X 10.14 (Mojave)     	  | Linux Ubuntu 18.04 64-bit*  |
+  Windows 64-bit 8.1     |  Mac OS X 10.13 (High Sierra)    | Linux Ubuntu 16.04 64-bit*  |
+| Windows 64-bit 7       |  Mac OS X 10.12 (Sierra)         | Linux CentOS 7 64-bit* **   |
+|                        |                                  | Linux CentOS 6 64-bit*  **  |
+
+\* Latest stable build  
+\** Support for CentOS temporarily dropped starting from version 1.1  

 Download
 ========

-You can download tested install packages for OS X, Windows, and Linux from our site: [www.robomongo.org](http://www.robomongo.org).
+You can download tested installer packages for macOS, Windows, and Linux from our site: [www.robomongo.org](http://www.robomongo.org).

-The latest stable release is currently **Robomongo 0.8.5**.
+The latest stable release is currently [**Robo 3T 1.3**](http://blog.robomongo.org/robo-3t-1-3/).

 Support
 =======

-Robomongo is an open source project driven by volunteers. We'll try to get to your questions as soon as we can, but please be patient :).
+Robo 3T is an open source project driven by volunteers. We'll try to get to your questions as soon as we can, but please be patient :).

 You can:

 - [Create a new issue in the Github issue queue](https://github.com/paralect/robomongo/issues)

- - [Join developer discussion on Gitter](https://gitter.im/paralect/robomongo) [![Join the chat at https://gitter.im/paralect/robomongo](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/paralect/robomongo?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
-Build
-=====
-
-The wiki contains prerequisites and instructions to [Build Robomongo](https://github.com/paralect/robomongo/wiki/Build-Robomongo).
-
-If you want to compile from source yourself, you should be able to do so cleanly from a [release branch](https://github.com/paralect/robomongo/releases).
-
-What's Planned for the Next Release?
-====================================
-
-We are currently working toward a [0.9.0 release milestone](https://github.com/paralect/robomongo/milestones/Robomongo%200.9.0)
-with some major features targeted including compatibility with MongoDB 3.0
-(updated shell, SCRAM-SHA-1 auth, support for WiredTiger storage engine)
-and full support for replica sets.
+ - [Join developer discussion on Gitter](https://gitter.im/paralect/robomongo)

 Contribute!
 ===========

-### Vote for Features
-
-Please view our [Magic Backlog](http://app.robomongo.org/backlog) to see features prioritised by donation. The small amount of donations we currently receive are put toward hosting costs.
-
 ### Suggest Features

 New feature suggestions or UI improvements are always welcome.
+[Create a new feature request on github](https://github.com/paralect/robomongo/issues/new)

 This project is powered by open source volunteers, so we have a limited amount of development resource to address all requests. We will certainly make best efforts to progress (particularly for those with strong community upvotes).

 ### Code Contributions

-Code contributions are always welcome! Just try to follow our coding style: [Robomongo Coding Style](https://github.com/paralect/robomongo/wiki/Robomongo-Coding-Style).
+Code contributions are always welcome! Just try to follow our pre-commit checks and coding style: 
+- [Robo 3T Code Quality](https://github.com/paralect/robomongo/wiki/Robomongo-Code-Quality)
+- [Robo 3T C++11/14 Transition Guide](https://github.com/Studio3T/robomongo/wiki/Robomongo-Cplusplus-11,-14-Transition-Guide)
+- [Robo 3T Coding Style](https://github.com/paralect/robomongo/wiki/Robomongo-Coding-Style)

 If you plan to contribute, please create a Github issue (or comment on the relevant existing issue) so we can help coordinate with upcoming release plans.

-For a general workflow, see Github's guide to [Fork a Repo](https://help.github.com/articles/fork-a-repo/).
-
 Pull requests (PRs) should generally be for discrete issues (i.e. one issue per PR please) and be clean to merge against the current master branch. It would also be helpful if you can confirm what testing has been done (specific O/S targets and MongoDB versions if applicable).

 A usual naming approach for feature branches is `issue-###`. Include the issue number in your commit message / pull request description to link the PR to the original issue.
@@ -81,7 +127,7 @@ There are a number of issues we could use help with reproducing. They are marked
 License
 =======

-Copyright (C) 2013-2015 [Paralect, Inc](http://www.paralect.com)
+Copyright 2014-2019 [3T Software Labs Ltd](https://studio3t.com/). All rights reserved.

 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License version 3 as 
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"       # Get directory of this file
+PROJECT_DIR=$(dirname $BIN_DIR)                                   # Get root directory of project
+
+source $BIN_DIR/build || exit $?
+source $BIN_DIR/run_tests $1
@@ -0,0 +1,15 @@
+@echo off
+setlocal enableextensions enabledelayedexpansion
+
+rem Path to bin and project folder
+set BIN_DIR_WITH_BACKSLASH=%~dp0%
+set BIN_DIR=%BIN_DIR_WITH_BACKSLASH:~0,-1%
+set PROJECT_DIR=%BIN_DIR%\..
+
+rem Run build
+call "%BIN_DIR%\build.bat" %*
+if %ERRORLEVEL% neq 0 (exit /b 1)
+
+rem Run tests
+call "%BIN_DIR%\run_tests.bat" %*
+if %ERRORLEVEL% neq 0 (exit /b 1)
@@ -12,4 +12,4 @@ if %ERRORLEVEL% neq 0 (exit /b 1)

 rem Run CMake configuration step
 cd "%BUILD_DIR%"
-cmake -G "Visual Studio 12 2013 Win64" -D "CMAKE_PREFIX_PATH=%PREFIX_PATH%" -D "CMAKE_BUILD_TYPE=%BUILD_TYPE%" -D "CMAKE_INSTALL_PREFIX=%INSTALL_PREFIX%" %PROJECT_DIR%
+cmake -G "Visual Studio 14 2015 Win64" -D "CMAKE_PREFIX_PATH=%PREFIX_PATH%" -D "CMAKE_BUILD_TYPE=%BUILD_TYPE%" -D "CMAKE_INSTALL_PREFIX=%INSTALL_PREFIX%" %PROJECT_DIR%
@@ -6,7 +6,7 @@ source $BIN_DIR/common/setup $1

 if [ "$(uname -s)" == "Darwin" ]; then
    # On Mac OS we should run executable from bundle
-    "$BUILD_DIR/src/robomongo/Robomongo.app/Contents/MacOS/Robomongo"
+    "$BUILD_DIR/src/robomongo/Robo 3T.app/Contents/MacOS/Robo 3T"
 else
-    "$BUILD_DIR/src/robomongo/robomongo"
+    "$BUILD_DIR/src/robomongo/robo3t"
 fi
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"       # Get directory of this file
+PROJECT_DIR=$(dirname $BIN_DIR)                                   # Get root directory of project
+source $BIN_DIR/common/setup $1
+
+echo 
+echo "*******************  Running unit tests in $BUILD_TYPE mode *******************"
+echo 
+
+if [ "$(uname -s)" == "Darwin" ]; then
+    EXE="$BUILD_DIR/src/robomongo-unit-tests/robo_unit_tests"
+    echo "Running file: $EXE"
+    "$EXE"
+else # Linux
+    echo "Error: Currently unit testing is disabled for Linux due to MongoDB linking problem"
+    exit 0
+    EXE="$BUILD_DIR/src/robomongo-unit-tests/robo_unit_tests"
+    echo "Running file: $EXE"
+    "$EXE"
+fi 
@@ -0,0 +1,15 @@
+@echo off
+setlocal enableextensions enabledelayedexpansion
+
+rem Path to bin and project folder
+set BIN_DIR_WITH_BACKSLASH=%~dp0%
+set BIN_DIR=%BIN_DIR_WITH_BACKSLASH:~0,-1%
+set PROJECT_DIR=%BIN_DIR%\..
+
+rem Run tests
+echo.
+echo *******************  Running unit tests for Release mode ******************* 
+echo ** Note: Only Release mode is supported on Windows 
+echo.
+echo "Running file: \build\Release\src\robomongo-unit-tests\Release\robo_unit_tests.exe"
+call "%PROJECT_DIR%\\build\Release\src\robomongo-unit-tests\Release\robo_unit_tests.exe" %*
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"       # Get directory of this file
+PROJECT_DIR=$(dirname $BIN_DIR)                                   # Get root directory of project
+
+VERSION="$(echo $1 | tr '[A-Z]' '[a-z]')"
+if [ -z "$VERSION" ]; then
+    echo "Usage: tag <name>"
+    echo "Example: tag 0.9.0-rc9"
+    exit
+fi
+
+if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then
+    echo "Error: You are not on master branch"
+    exit
+fi
+
+cd $PROJECT_DIR
+git tag -a "v${VERSION}" -m "${VERSION}"
+git push --tags
@@ -46,33 +46,33 @@ set(MongoDB_DEFINITIONS
 # Set common compiler include directories
 set(MongoDB_INCLUDE_DIRS
    ${MongoDB_DIR}/src
-    ${MongoDB_DIR}/src/third_party/boost-1.56.0
-    ${MongoDB_DIR}/src/third_party/mozjs-38/include
-    ${MongoDB_DIR}/src/third_party/mozjs-38/mongo_sources
-    ${MongoDB_DIR}/src/third_party/pcre-8.37
+    ${MongoDB_DIR}/src/third_party/boost-1.60.0
+    ${MongoDB_DIR}/src/third_party/mozjs-45/include
+    ${MongoDB_DIR}/src/third_party/mozjs-45/mongo_sources
+    ${MongoDB_DIR}/src/third_party/pcre-8.41
    ${MongoDB_BUILD_DIR}
 )

 if(SYSTEM_LINUX)
    set(MongoDB_OBJECT_LIST_PLATFORM_PART linux)
    list(APPEND MongoDB_INCLUDE_DIRS
-        ${MongoDB_DIR}/src/third_party/mozjs-38/platform/x86_64/linux/include)
+        ${MongoDB_DIR}/src/third_party/mozjs-45/platform/x86_64/linux/include)
 elseif(SYSTEM_WINDOWS)
    set(MongoDB_OBJECT_LIST_PLATFORM_PART windows)
    list(APPEND MongoDB_INCLUDE_DIRS
-        ${MongoDB_DIR}/src/third_party/mozjs-38/platform/x86_64/windows/include)
+        ${MongoDB_DIR}/src/third_party/mozjs-45/platform/x86_64/windows/include)
 elseif(SYSTEM_MACOSX)
    set(MongoDB_OBJECT_LIST_PLATFORM_PART macosx)
    list(APPEND MongoDB_INCLUDE_DIRS
-        ${MongoDB_DIR}/src/third_party/mozjs-38/platform/x86_64/osx/include)
+        ${MongoDB_DIR}/src/third_party/mozjs-45/platform/x86_64/macOS/include)
 elseif(SYSTEM_FREEBSD)
    set(MongoDB_OBJECT_LIST_PLATFORM_PART freebsd)
    list(APPEND MongoDB_INCLUDE_DIRS
-        ${MongoDB_DIR}/src/third_party/mozjs-38/platform/x86_64/freebsd/include)
+        ${MongoDB_DIR}/src/third_party/mozjs-45/platform/x86_64/freebsd/include)
 elseif(SYSTEM_OPENBSD)
    set(MongoDB_OBJECT_LIST_PLATFORM_PART openbsd)
    list(APPEND MongoDB_INCLUDE_DIRS
-        ${MongoDB_DIR}/src/third_party/mozjs-38/platform/x86_64/openbsd/include)
+        ${MongoDB_DIR}/src/third_party/mozjs-45/platform/x86_64/openbsd/include)
 endif()

 # Read list of object files
@@ -91,6 +91,14 @@ foreach(lib ${MongoDB_RELATIVE_LIBS})
  list(APPEND MongoDB_LIBS ${MongoDB_DIR}/${lib})
 endforeach()

+if(SYSTEM_WINDOWS)
+  list(APPEND MongoDB_LIBS $ENV{WindowsSdkDir}/Lib/$ENV{WindowsSDKLibVersion}/um/x64/Crypt32.Lib)
+  list(APPEND MongoDB_LIBS $ENV{WindowsSdkDir}/Lib/$ENV{WindowsSDKLibVersion}/um/x64/Secur32.Lib)  
+  list(APPEND MongoDB_LIBS $ENV{WindowsSdkDir}/Lib/$ENV{WindowsSDKLibVersion}/um/x64/Dnsapi.lib) 
+elseif(SYSTEM_LINUX)  
+  list(APPEND MongoDB_LIBS /lib/x86_64-linux-gnu/libresolv.so.2) 
+endif()
+
 # Get MongoDB repository recent tag
 execute_process(
    COMMAND git describe --abbrev=0 --tags
@@ -0,0 +1,145 @@
+##################################################
+# Find and Add OpenSSL shared (dynamic) library 
+# 
+# - This module defines the following variables:
+#   OpenSSL_DIR
+#   OPENSSL_VERSION
+#
+# - Imported shared(dynamic) libraries "ssl" and "crypto" are created.
+#
+# - It is assumed that OpenSSL has been built and path to OpenSSL build directory is 
+#   added into system(environment) variable ROBOMONGO_CMAKE_PREFIX_PATH.
+#
+##################################################
+
+# Try to find OpenSSL directory (uses CMAKE_PREFIX_PATH locations)
+#-------------------------------------------
+
+if(SYSTEM_WINDOWS)
+  find_path(
+      OpenSSL_DIR inc32/openssl/ssl.h
+      DOC "Path to OpenSSL (github.com/openssl/openssl) root directory"
+  )
+else()
+  find_path(
+      OpenSSL_DIR include/openssl/ssl.h
+      DOC "Path to OpenSSL (github.com/openssl/openssl) root directory"
+  )
+endif()
+
+# Find OpenSSL version
+#-------------------------------------------
+
+if(SYSTEM_WINDOWS)
+  set (OPENSSL_INCLUDE_DIR "${OpenSSL_DIR}/inc32")
+else()
+  set (OPENSSL_INCLUDE_DIR "${OpenSSL_DIR}/include")
+endif()
+
+function(from_hex HEX DEC)
+  string(TOUPPER "${HEX}" HEX)
+  set(_res 0)
+  string(LENGTH "${HEX}" _strlen)
+
+  while (_strlen GREATER 0)
+    math(EXPR _res "${_res} * 16")
+    string(SUBSTRING "${HEX}" 0 1 NIBBLE)
+    string(SUBSTRING "${HEX}" 1 -1 HEX)
+    if (NIBBLE STREQUAL "A")
+      math(EXPR _res "${_res} + 10")
+    elseif (NIBBLE STREQUAL "B")
+      math(EXPR _res "${_res} + 11")
+    elseif (NIBBLE STREQUAL "C")
+      math(EXPR _res "${_res} + 12")
+    elseif (NIBBLE STREQUAL "D")
+      math(EXPR _res "${_res} + 13")
+    elseif (NIBBLE STREQUAL "E")
+      math(EXPR _res "${_res} + 14")
+    elseif (NIBBLE STREQUAL "F")
+      math(EXPR _res "${_res} + 15")
+    else()
+      math(EXPR _res "${_res} + ${NIBBLE}")
+    endif()
+
+    string(LENGTH "${HEX}" _strlen)
+  endwhile()
+
+  set(${DEC} ${_res} PARENT_SCOPE)
+endfunction()
+
+if (OPENSSL_INCLUDE_DIR)
+  if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
+    file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
+         REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
+
+    # The version number is encoded as 0xMNNFFPPS: major minor fix patch status
+    # The status gives if this is a developer or prerelease and is ignored here.
+    # Major, minor, and fix directly translate into the version numbers shown in
+    # the string. The patch field translates to the single character suffix that
+    # indicates the bug fix state, which 00 -> nothing, 01 -> a, 02 -> b and so
+    # on.
+
+    string(REGEX REPLACE "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F]).*$"
+           "\\1;\\2;\\3;\\4;\\5" OPENSSL_VERSION_LIST "${openssl_version_str}")
+    list(GET OPENSSL_VERSION_LIST 0 OPENSSL_VERSION_MAJOR)
+    list(GET OPENSSL_VERSION_LIST 1 OPENSSL_VERSION_MINOR)
+    from_hex("${OPENSSL_VERSION_MINOR}" OPENSSL_VERSION_MINOR)
+    list(GET OPENSSL_VERSION_LIST 2 OPENSSL_VERSION_FIX)
+    from_hex("${OPENSSL_VERSION_FIX}" OPENSSL_VERSION_FIX)
+    list(GET OPENSSL_VERSION_LIST 3 OPENSSL_VERSION_PATCH)
+
+    if (NOT OPENSSL_VERSION_PATCH STREQUAL "00")
+      from_hex("${OPENSSL_VERSION_PATCH}" _tmp)
+      # 96 is the ASCII code of 'a' minus 1
+      math(EXPR OPENSSL_VERSION_PATCH_ASCII "${_tmp} + 96")
+      unset(_tmp)
+      # Once anyone knows how OpenSSL would call the patch versions beyond 'z'
+      # this should be updated to handle that, too. This has not happened yet
+      # so it is simply ignored here for now.
+      string(ASCII "${OPENSSL_VERSION_PATCH_ASCII}" OPENSSL_VERSION_PATCH_STRING)
+    endif ()
+
+    set(OPENSSL_VERSION "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH_STRING}")
+  endif ()
+endif ()
+
+
+# Add imported ssl and crypto libraries
+#-------------------------------------------
+    
+# Add imported target ssl (ssleay32)
+add_library(ssl SHARED IMPORTED)
+
+# Add imported target for crypto (libeay32)
+add_library(crypto SHARED IMPORTED)
+    
+if(SYSTEM_WINDOWS)
+    set_target_properties(ssl PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES   "${OpenSSL_DIR}/inc32"
+        IMPORTED_IMPLIB                 "${OpenSSL_DIR}/out32dll/ssleay32.lib"
+    )
+    set_target_properties(crypto PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES   "${OpenSSL_DIR}/inc32"
+        IMPORTED_IMPLIB                 "${OpenSSL_DIR}/out32dll/libeay32.lib"
+    )
+elseif(SYSTEM_MACOSX)
+    set_target_properties(ssl PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES   "${OpenSSL_DIR}/include"
+        IMPORTED_LOCATION               "${OpenSSL_DIR}/libssl.dylib"
+    )
+    set_target_properties(crypto PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES   "${OpenSSL_DIR}/include"
+        IMPORTED_LOCATION               "${OpenSSL_DIR}/libcrypto.dylib"
+    )
+elseif(SYSTEM_LINUX)
+    set_target_properties(ssl PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES   "${OpenSSL_DIR}/include"
+        IMPORTED_LOCATION               "${OpenSSL_DIR}/libssl.so"
+    )
+    set_target_properties(crypto PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES   "${OpenSSL_DIR}/include"
+        IMPORTED_LOCATION               "${OpenSSL_DIR}/libcrypto.so"
+    )
+endif()
+
+# End of file
@@ -1,3 +1,3 @@

-set(ROBOMONGO_DISPLAY_NAME "Robomongo")
-set(ROBOMONGO_DISPLAY_FULL_NAME "Robomongo ${PROJECT_VERSION}")
+set(ROBOMONGO_DISPLAY_NAME "Robo 3T")
+set(ROBOMONGO_DISPLAY_FULL_NAME "Robo 3T ${PROJECT_VERSION}")
@@ -1,6 +1,6 @@
 # Show configuration summary and build tip
 message("")
-message(" _______________[ Robomongo configuration summary ]________________")
+message(" _______________[ Robo 3T configuration summary ]________________")
 message("| ")
 message("|-- Dependencies:")
 message("| ")
@@ -8,7 +8,11 @@ message("|   Qt5 Core:           ${Qt5Core_VERSION}     ${Qt5Core_DIR}")
 message("|   Qt5 Gui:            ${Qt5Gui_VERSION}     ${Qt5Gui_DIR}")
 message("|   Qt5 Widgets:        ${Qt5Widgets_VERSION}     ${Qt5Widgets_DIR}")
 message("|   Qt5 PrintSupport:   ${Qt5Widgets_VERSION}     ${Qt5PrintSupport_DIR}")
-message("|   MongoDB:            ${MongoDB_VERSION}     ${MongoDB_BUILD_DIR}")
+message("|   Qt5 Network:        ${Qt5Network_VERSION}     ${Qt5Network_DIR}")
+message("|   Qt5 Xml:            ${Qt5Xml_VERSION}     ${Qt5Xml_DIR}")
+message("|   MongoDB:            ${MongoDB_VERSION}    ${MongoDB_BUILD_DIR}")
+message("|   OpenSSL:            ${OPENSSL_VERSION}    ${OpenSSL_DIR}")
+message("|   Googe Test:         ${GOOGLE_TEST_VERSION}     ${CMAKE_SOURCE_DIR}/${GOOGLE_TEST_DIR}")
 message("|")
 message("|-- Summary:")
 message("|")
@@ -19,12 +23,15 @@ endif()
 message("|   Build type:       ${CMAKE_BUILD_TYPE}")
 message("|   Install path:     ${CMAKE_INSTALL_PREFIX}")
 message("|")
-message("|-- Building and installing:")
+message("|-- Build, Run and Install:")
 message("| ")
-message("|   Now you can build Robomongo with the following command:")
-message("|     $ cmake --build .")
+message("|     $ bin/build")
+message("|     $ bin/run")
+message("|     $ bin/install")
 message("|")
-message("|   And install it to ${CMAKE_INSTALL_PREFIX}:")
-message("|     $ cmake --build . --target install")
+message("|-- Run Unit Tests:")
+message("| ")
+message("|     $ bin/build_and_run_tests")
+message("|     $ bin/run_tests (without building)")
 message("|__________________________________________________________________")
 message("")
@@ -52,6 +52,18 @@ elseif("${CMAKE_BUILD_TYPE}" MATCHES "MinSizeRel")
    set(BUILD_MINSIZEREL TRUE)
 endif()

+# Compiler checks
+# We check Clang using MATCH instead of strict equality, because as of CMake 3.0.0 the
+# CMAKE_<LANG>_COMPILER_ID value for Apple-provided Clang is AppleClang. To test
+# for both the Apple-provided Clang and the regular Clang we use MATCH.
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(COMPILER_CLANG TRUE)
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "^GNU$")
+    set(COMPILER_GCC TRUE)
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "^MSVC$")
+    set(COMPILER_MSVC TRUE)
+endif()
+
 # Link "groups" and "whole-archive" options
 if(SYSTEM_LINUX OR SYSTEM_FREEBSD OR SYSTEM_OPENBSD)
    set(LINK_LIBGROUP_START        -Wl,--start-group)
@@ -24,7 +24,7 @@ if(SYSTEM_LINUX)
    set(qt_conf_dir         ${bin_dir})
    set(qt_conf_plugins     "../lib")
 elseif(SYSTEM_MACOSX)
-    set(bundle_name         Robomongo.app)
+    set(bundle_name         "Robo 3T.app")
    set(contents_path       ${bundle_name}/Contents)

    set(bin_dir             ${contents_path}/MacOS)
@@ -56,6 +56,29 @@ install(
    FILES       "${CMAKE_BINARY_DIR}/qt.conf"
    DESTINATION "${qt_conf_dir}")

+# Install OpenSSL dynamic lib files
+if(SYSTEM_WINDOWS)
+    install(
+        FILES 
+        "${OpenSSL_DIR}/out32dll/ssleay32.dll"
+        "${OpenSSL_DIR}/out32dll/libeay32.dll"
+        DESTINATION ${bin_dir})
+elseif(SYSTEM_MACOSX)
+    install(
+        FILES 
+        "${OpenSSL_DIR}/libssl.1.0.0.dylib"
+        "${OpenSSL_DIR}/libcrypto.1.0.0.dylib"
+        DESTINATION ${lib_dir}/lib)
+elseif(SYSTEM_LINUX)
+    install(
+        FILES 
+        "${OpenSSL_DIR}/libssl.so"
+        "${OpenSSL_DIR}/libssl.so.1.0.0"        
+        "${OpenSSL_DIR}/libcrypto.so"        
+        "${OpenSSL_DIR}/libcrypto.so.1.0.0"
+        DESTINATION ${lib_dir})         
+endif()
+
 # Install binary
 install(
    TARGETS robomongo
@@ -72,16 +95,21 @@ install(
    DESTINATION ${license_dir})

 # Install common dependencies
-install_qt_lib(Core Gui Widgets PrintSupport)
+install_qt_lib(Core Gui Widgets PrintSupport Network Xml)
 install_qt_plugins(QGifPlugin QICOPlugin)
 install_icu_libs()

 if(SYSTEM_LINUX)
    install_qt_lib(XcbQpa DBus)
    install_qt_plugins(
-        QGtk2ThemePlugin
        QXcbIntegrationPlugin)
-
+        
+    # Install newer versions of libstdc++ to support C++11
+    install(
+        FILES
+            "/usr/lib/x86_64-linux-gnu/libstdc++.so.6"
+            "/usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.22"
+        DESTINATION ${lib_dir})
 elseif(SYSTEM_MACOSX)
    install_qt_lib(MacExtras DBus)
    install_qt_plugins(
@@ -91,7 +119,7 @@ elseif(SYSTEM_MACOSX)

    # Install icon
    install(
-        FILES       "${CMAKE_SOURCE_DIR}/install/macosx/Robomongo.icns"
+        FILES       "${CMAKE_SOURCE_DIR}/install/macosx/robomongo.icns"
        DESTINATION "${resources_dir}")
 elseif(SYSTEM_WINDOWS)
    install_qt_plugins(
@@ -105,4 +133,3 @@ elseif(SYSTEM_WINDOWS)
    set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION .)
    include(InstallRequiredSystemLibraries)
 endif()
-
@@ -15,7 +15,7 @@ execute_process(
 string(TIMESTAMP timestamp "%Y-%m-%d")

 # Package name (as it should appear in UI)
-set(CPACK_PACKAGE_NAME Robomongo)
+set(CPACK_PACKAGE_NAME robo3t)

 # Version of the package
 set(CPACK_PACKAGE_VERSION_MAJOR     ${PROJECT_VERSION_MAJOR})
@@ -34,10 +34,10 @@ set(CPACK_MONOLITHIC_INSTALL ON)
 set(CPACK_STRIP_FILES ON)

 # Additional information
-set(CPACK_PACKAGE_VENDOR Paralect)
-set(CPACK_PACKAGE_CONTACT robomongo@paralect.com)
+set(CPACK_PACKAGE_VENDOR "3T Software Labs Ltd")
+set(CPACK_PACKAGE_CONTACT robo3t@3t.io)
 set(CPACK_PACKAGE_DESCRIPTION "Shell-centric cross-platform MongoDB management tool.")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Robomongo is a shell-centric cross-platform MongoDB management tool.")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Robo 3T is a shell-centric cross-platform MongoDB management tool.")

 # Use lowercase for system name and package file name
 string(TOLOWER ${CMAKE_SYSTEM_NAME} system_name)
@@ -62,7 +62,7 @@ elseif(SYSTEM_MACOSX)

 elseif(SYSTEM_WINDOWS)
    set(files_dir "${CMAKE_SOURCE_DIR}/install/windows")
-    set(exe_name "Robomongo.exe")
+    set(exe_name "robo3t.exe")

    set(CPACK_GENERATOR NSIS ZIP)
    set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/DESCRIPTION")
@@ -10,17 +10,18 @@ elseif(SYSTEM_WINDOWS)
    # The /MP option can reduce the total time to compile the source files. This option
    # causes the compiler to create one or more copies of itself, each in a separate process.
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+    set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} /MP")

    set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} psapi.lib bcrypt.lib Iphlpapi.lib dbghelp.lib ws2_32.lib winmm.lib version.lib")
 endif()

-set(PROJECT_NAME "Robomongo")
+set(PROJECT_NAME "Robo 3T")
 set(PROJECT_NAME_TITLE ${PROJECT_NAME})
 set(PROJECT_DOMAIN "www.robomongo.org")
-set(PROJECT_COMPANYNAME "Paralect")
-set(PROJECT_COPYRIGHT "Copyright (C) 2013-2015 ${PROJECT_COMPANYNAME} All Rights Reserved.")
-set(PROJECT_COMPANYNAME_DOMAIN "www.paralect.com")
-set(PROJECT_GITHUB_FORK "www.github.com/paralect/robomongo")
-set(PROJECT_GITHUB_ISSUES "www.github.com/paralect/robomongo/issues")
+set(PROJECT_COMPANYNAME "3T Software Labs Ltd")
+set(PROJECT_COPYRIGHT "Copyright (C) 2014-2017 ${PROJECT_COMPANYNAME} All Rights Reserved.")
+set(PROJECT_COMPANYNAME_DOMAIN "https://studio3t.com/")
+set(PROJECT_GITHUB_FORK "www.github.com/Studio3T/robomongo")
+set(PROJECT_GITHUB_ISSUES "www.github.com/Studio3T/robomongo/issues")

 string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE)
@@ -0,0 +1,4 @@
+DbgHelp.lib Iphlpapi.lib Psapi.lib advapi32.lib bcrypt.lib crypt32.lib 
+dnsapi.lib kernel32.lib shell32.lib pdh.lib version.lib winmm.lib ws2_32.lib 
+secur32.lib winmm.lib 
+/PDB:build\debug\mongo\mongo.pdb /DEBUG
@@ -0,0 +1,3 @@
+DbgHelp.lib Iphlpapi.lib Psapi.lib advapi32.lib bcrypt.lib crypt32.lib dnsapi.lib 
+kernel32.lib shell32.lib pdh.lib version.lib winmm.lib ws2_32.lib secur32.lib winmm.lib 
+/PDB:build\opt\mongo\mongo.pdb /DEBUG
@@ -0,0 +1,189 @@
+Building Robo 3T (Mac OS X and Linux)  
+==================
+
+A. Prerequisites
+-------------
+
+1. Modern Compiler   
+A modern and complete C++11 compiler. One of the following is required:  
+```
+GCC 5.3.0  
+Clang 3.4 (or Apple XCode 5.1.1 Clang) or newer  
+```
+
+2. Install CMake (3.6.0 or later)
+3. Install [Scons](http://scons.org/tag/releases.html) (2.5 or later) 
+
+```
+cd scons-**
+python setup.py install
+```
+   
+4. Install Qt 5.9.3
+
+  ```sh
+Example installation for MAC OSX and Ubuntu:
+    Go to http://download.qt.io/archive/qt/5.9/5.9.3/
+    Download, run and install 
+      qt-opensource-mac-x64-clang-5.9.3.dmg (for MAC OSX) 
+      qt-opensource-linux-x64-5.9.0.run (for Linux)
+    After successful installation you should have 
+      /path/to/qt-5.9.3/5.7/clang_64 (for MAC OSX)
+      /path/to/qt-5.9.3/5.7/gcc_64 (for Linux)
+
+More information for installing on Ubuntu:
+https://wiki.qt.io/Install_Qt_5_on_Ubuntu
+```
+
+5. Download and Build OpenSSL (1.0.2o) - (explained below in section B) 
+
+B. Building Robo 3T and Dependencies
+-------------
+
+#### Step 1. Build OpenSSL (1.0.2o)
+
+Steps to build OpenSSL on MAC:
+
+  ```sh
+Download openssl-1.0.2o (https://www.openssl.org/source/old/1.0.2/)
+tar -xvzf openssl-1.0.2o.tar.gz
+cd openssl-1.0.2o
+./Configure darwin64-x86_64-cc shared --openssldir="@rpath"
+make (or sudo make)
+mkdir lib
+cp libssl*.dylib libcrypto*.dylib lib/
+```
+Helper Commands
+  ```sh
+// to start fresh build
+make clean
+```
+
+Steps to build OpenSSL on Linux:
+
+  ```sh
+Download openssl-1.0.x (ftp://ftp.openssl.org/source/old/1.0.x/openssl-1.0.x.tar.gz)
+tar -xvzf openssl-1.0.x.tar.gz
+cd /home/<user>/Downloads/openssl-1.0.x
+./config shared
+make
+mkdir lib
+cp libssl* libcrypto* lib/
+```
+
+#### Step 2. Build Robo 3T Shell (fork of MongoDB)
+
+Clone Robo 3T Shell and checkout to `roboshell-v4.0.4` branch:
+
+  ```sh
+  $ git clone https://github.com/paralect/robomongo-shell.git
+  $ cd robomongo-shell
+  $ git branch // make sure it is "roboshell-v4.0.4"
+  ```
+
+Set special environment variable `ROBOMONGO_CMAKE_PREFIX_PATH` to point to a set of 
+directories:
+
+1. Location of Qt 5 SDK  
+2. Location of Robo 3T Shell  
+3. Location of OpenSSL  
+
+Separate directories by semicolon `;` (not colon):
+
+    // MAC OSX example:
+    $ export ROBOMONGO_CMAKE_PREFIX_PATH="/path/to/qt-5.x.x/5.x/clang_64;/path/to/robomongo-shell;/path/to/openssl-1.0.xx"
+    // Ubuntu example:
+    $ export ROBOMONGO_CMAKE_PREFIX_PATH="/home/<user>/Qt5.x.x/5.x.x/gcc_64/;/home/<user>/robomongo-shell;/home/<user>/Downloads/openssl-1.0.xx"
+
+Install pip requirements
+
+```
+   // macOS / Linux assuming python = python 2.7
+   pip install --user -r etc/pip/dev-requirements.txt
+```
+
+Build Robo 3T Shell (in release mode by default):
+
+  ```sh
+  $ bin/build
+  ```
+
+Known Issues & Solutions about building: 
+```
+// macOS / Linux assuming python = python 2.7
+pip install --user -r etc/pip/dev-requirements.txt
+pip install typing
+
+Also see:
+https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+```
+
+Build Robo 3T Shell in debug mode:
+
+  ```sh
+  $ bin/build debug
+  ```
+  
+Clean build files for release mode:
+  ```sh
+  $ bin/clean
+  ```
+
+Clean build files for debug mode:
+  ```sh
+  $ bin/clean debug
+  ```
+  
+For more information refer to [Building Robo 3T Shell](BuildRobo3TShell.md) 
+
+#### Step 3. Build Robo 3T
+
+Download Robo 3T: 
+
+    $ git clone https://github.com/Studio3T/robomongo
+    $ cd robomongo
+
+Run configuration step:
+    
+    $ bin/configure 
+    
+And finally, build Robo 3T:
+    
+    $ bin/build 
+
+To run robomongo:
+
+    $ bin/run
+    
+
+**Debug mode**
+
+For debug mode append `debug` for each command
+e.g. `bin/configure debug` or  `bin/build debug` etc..
+
+**Helper commands**
+    
+Clean build files (in order to start build from scratch):
+
+    $ bin/clean
+    
+Install Robo 3T to `build/release/install` folder:
+
+    $ bin/install
+    
+Create package for your OS in `build/release/package` folder:
+
+    $ bin/pack
+
+**Important Notes**
+- For macOS builds, it might be needed to patch QScintilla with `QScintilla-2.9.3-xcode8.patch` found at robomongo repository's root.
+
+- For Ubuntu 16.04 builds, it has been reported that Robo 3T /bin/configure step might fail and installing mesa-common-dev package solves it. Details: https://github.com/paralect/robomongo/issues/1268 
+
+- For Centos builds, Robo 3T /bin/configure step might fail due to error: `failed to find gl/gl.h`. In this case, the following packages must be installed:
+
+```sh
+$ sudo yum install mesa-libGL
+$ sudo yum install mesa-libGL-devel
+  ```
+
@@ -0,0 +1,203 @@
+Building Robo 3T (Windows)
+==============================
+
+A. Prerequisites
+-------------
+
+#### 0. Git
+
+ Download Git installer from http://git-scm.com (we are using Git-2.7.0-64-bit).
+  
+ When you'll see "Adjusting your PATH environment" wizard page, select
+ "Use Git from the Windows Command Prompt" option. This will allow to 
+ execute Git from both Windows Command Prompt and Bash. This is required,
+ because both MongoDB and Robo 3T uses `git` command during build process
+ which must be perfomed from Windows Command Prompt (not Bash).
+ 
+ On "Configuring the line ending conversion" wizard page, select "Checkout
+ Windows-style, commit Unix-style line ending" option. This is a common mode
+ for cross-platform projects and required by both MongoDB and Robo 3T.
+  
+ All other Git installer options are not important (use defaults).
+ 
+ If you are using SSH clone url, start SSH agent and add your private key
+ with this commands in Git Bash:
+ 
+    $ eval `ssh-agent`       # starts ssh agent
+    $ ssh-add ~/.ssh/mykey   # add your key (which can be in any folder)
+  
+#### 1. Visual Studio 2015 (i.e. MSVC14) Update 2 or newer
+
+ We use Visual Studio 2015 Update 3, and recommend to use this version to save
+ time for Qt compilation. Currently prebuilt binaries for Qt are available 
+ from official Qt site. But you can use any newer version and compile Qt library
+ yourself.
+
+#### 2. ActivePython 2.7 
+   
+ Download ActivePython from http://www.activestate.com/activepython/downloads
+   
+ Download MSI x64 version. Use default settings in installation wizard. 
+ This installer will add path to `python.exe` to your `PATH` variable.
+
+#### 3. SCons 2.3.5 or newer
+
+We use SCons 2.5.0.
+
+ Download Scons from http://scons.org/tag/releases.html
+   
+ Use ZIP archive, not MSI
+   
+ Open Command Prompt, navigate to Scons directory and run:
+   
+    $ setup.py install
+    
+ This command will make `scons` command accessible from Command Prompt
+
+#### 4. CMake 
+We use CMake 3.6.0-rc3
+ Download CMake from https://cmake.org/download
+ 
+ Use installer package, it will allow you to configure your PATH variable and `cmake`
+ command will be available from Command Prompt. For this set "Add CMake to the system
+ PATH for current user" in the installer wizard page. 
+   
+#### 5. Qt 5.9.3
+
+ Download and install Qt from http://download.qt.io/archive/qt 
+ Run the installer and select only 'msvc2015 64-bit'
+
+#### 6. OpenSSL (1.0.2o)
+Download openssl from (https://www.openssl.org/source/old/1.0.2/)
+  
+
+B. Building Robo 3T and Dependencies
+-------------
+
+#### 1. Build OpenSSL
+
+Steps to build OpenSSL on windows:
+  ```sh
+Open Visual Studio tool x64 Cross Tools Command prompt
+cd to the directory where you have openssl sources cd c:\myPath\openssl
+perl Configure VC-WIN64A
+ms\do_win64a
+nmake -f ms\ntdll.mak
+```
+
+**Check Point:**
+After successful build, newly created sub directory out32dll should contain dynamic lib files libeay32.lib (and libeay32.dll) and ssleay32.lib (and ssleay32.dll); and associated include files will be in newly created folder "inc32".
+
+Helper Commands:
+  ```sh
+// clean to start fresh build
+nmake -f ms\ntdll.mak clean
+```
+
+Refer to OpenSSL documentation for more information:  
+https://wiki.openssl.org/index.php/Compilation_and_Installation#W64
+
+#### 2. Build Robo 3T Shell (fork of MongoDB)
+
+Clone Robo 3T Shell and checkout to roboshell-v4.0.4 branch:
+
+  ```sh
+  $ git clone https://github.com/paralect/robomongo-shell.git
+  $ cd robomongo-shell
+  $ git branch // roboshell-v4.0.4
+  ```
+
+Set environment variable `ROBOMONGO_CMAKE_PREFIX_PATH`, required by Robo 3T-Shell and Robo 3T build scripts, needs to be set according to the following directories:
+
+1. Location of Qt SDK
+2. Location of Robo 3T Shell
+3. Location of OpenSSL
+
+Separate directories by semicolon `;` (not colon). You can do this in Command Prompt:
+
+    > setx ROBOMONGO_CMAKE_PREFIX_PATH "d:\Qt\Qt5.9.3\5.9.3\msvc2015_64;d:\path-to\robomongo-shell;c:\path-to\openssl-1.0.2o"
+
+
+Open '**a new**' VS2015 x64 Native Tools Command Prompt and navigate to `robomongo-shell` folder.
+
+Build shell in release mode:
+
+    > bin\build
+    
+Build shell in debug mode:
+
+    > bin\build debug 
+    
+Note that backslash is used (`\`), and not forward slash (`/`).
+
+Clean build files for release mode:
+
+    > bin\clean
+
+Clean build files for debug mode:
+
+    > bin\clean debug
+
+Refer to MongoDB documentation for additional information:
+https://docs.mongodb.org/manual/contributors/tutorial/build-mongodb-from-source/#windows-specific-instructions
+
+
+#### 3. Build Robo 3T   
+
+Clone Robo 3T:
+
+  ```sh
+  $ git clone https://github.com/paralect/robomongo.git
+  ```
+  
+Open VS2015 x64 Native Tools Command Prompt and navigate to `robomongo` folder.
+ 
+Run configuration step:
+    
+    > bin\configure 
+    
+And finally, build Robo 3T:
+    
+    > bin\build 
+  
+  ```
+  // Scons error on Windows: cheetah module not found
+    copy C:\Users\<user>\AppData\Roaming\Python\Python27\site-packages
+    to C:\Python27\Lib\site-packages 
+    // Also 
+    pip install Typing
+    pip install Cheetah
+  ```  
+
+**Run Robo 3T**
+
+Install Robo 3T to `build\Release\install` folder:
+
+    > bin\install
+   
+And run Robo 3T
+
+    > \robomongo\build\Release\install\robo3t.exe
+
+**Package Robo 3T**
+
+Install Robo 3T to `build\Release\install` folder:
+
+    > bin\pack
+
+Note: nsis-2.46-setup.exe with Full setup must be present.
+
+
+**Debug mode**
+
+For debug mode append `debug` for each command
+e.g. `bin\configure debug` or  `bin\build debug` etc..
+
+**Helper commands**
+
+Clean build files (in order to start build from scratch):
+
+    > bin\clean
+    
+
+   
@@ -0,0 +1,57 @@
+
+Building Robo 3T Shell
+========================
+
+Robo 3T uses [modified version](https://github.com/paralect/robomongo-shell/tree/roboshell-v3.4) of MongoDB that we call Robo 3T Shell.  
+Before you can build Robo 3T, you have to build Robo 3T Shell. The following instructions are applicable only for Mac OS X and Linux. For Windows instructions please check [Building Robo 3T on Windows](BuildRobo3TOnWindows.md).
+
+Build for Mac OS X or Linux
+---------------------------
+
+#### Prerequisites
+
+1. Install [Scons](http://scons.org/tag/releases.html) (2.3.5 or newer)
+
+
+2. Clone Robo 3T Shell and checkout to `roboshell-v3.4` branch:
+
+  ```sh
+  $ git clone https://github.com/paralect/robomongo-shell.git
+  $ cd robomongo-shell
+  $ git checkout roboshell-v3.4
+  ```
+
+3. Build Robo 3T Shell:
+
+  ```sh
+  $ bin/build
+  ```
+
+Done! Now you can continue with building Robo 3T 
+with embedded MongoDB 3.4 shell (that you've just built).
+
+
+<br/>
+#### Advanced helper commands
+
+The following commands are needed only if you are planning to develop or deeper understand
+Robo 3T or Robo 3T Shell build processes.
+
+Clean build files for release mode (folder `build/opt` will be removed):
+
+    $ bin/clean
+
+Here is a command that is executed by `bin/build` script:
+
+    $ scons mongo -j8 --release --osx-version-min=10.9
+    
+Argument `--osx-version-min` is required only for Mac OS.
+    
+Build MongoDB shell in debug mode:
+
+    $ scons mongo -j8 --dbg
+
+Clear builds:
+
+    $ scons -c mongo        # clears release build
+    $ scons -c --dbg mongo  # clears debug build
@@ -1,12 +1,21 @@
-Building Robomongo Shell
+Building Robomongo Shell (Old Document)
 ========================

+**Important Note:**  
+This document is for versions 1.0 and earlier and for MongoDB 3.2.  
+See latest documents here: https://github.com/Studio3T/robomongo/wiki
+
 Robomongo uses [modified version](https://github.com/paralect/robomongo-shell/tree/roboshell-v3.2) of MongoDB that we call Robomongo Shell. Before you can build Robomongo, you have to build Robomongo Shell. The following instructions are applicable only for Mac OS X and Linux. For Windows instructions please check [Building Robomongo on Windows](BuildingRobomongoOnWindows.md).

 Build for Mac OS X or Linux
 ---------------------------

-1. Clone Robomongo Shell and checkout to `roboshell-v3.2` branch:
+#### Prerequisites
+
+1. Install [Scons](http://scons.org/tag/releases.html) (2.4 or later)
+
+
+2. Clone Robomongo Shell and checkout to `roboshell-v3.2` branch:

  ```sh
  $ git clone https://github.com/paralect/robomongo-shell.git
@@ -14,7 +23,7 @@ Build for Mac OS X or Linux
  $ git checkout roboshell-v3.2
  ```

-2. Build Robomongo Shell:
+3. Build Robomongo Shell:

  ```sh
  $ bin/build
@@ -1,28 +1,108 @@
-Building Robomongo
+Building Robomongo (Mac OS X and Linux)
 ==================

-#### Step 1.
+**Important Note:**  
+This document is for versions 1.0 and earlier and for MongoDB 3.2.  
+See latest documents here: https://github.com/Studio3T/robomongo/wiki

-Download and build Robomongo Shell (our fork of MongoDB). 
-Refer to [Building Robomongo Shell](BuildingMongoDB.md) document.
+A. Prerequisites
+-------------

-#### Step 2.
+1. Install CMake (3.2 or later)
+2. Install [Scons](http://scons.org/tag/releases.html) (2.4 or later)
+3. Install Qt 5.7
+
+  ```sh
+Example installation for MAC OSX and Ubuntu:
+    Go to http://download.qt.io/archive/qt/5.7/5.7.0/
+    Download, run and install 
+      qt-opensource-mac-x64-clang-5.7.0.dmg (for MAC OSX) 
+      qt-opensource-linux-x64-5.7.0.run (for Linux)
+    After successful installation you should have 
+      /path/to/qt-5.7.0/5.7/clang_64 (for MAC OSX)
+      /path/to/qt-5.7.0/5.7/gcc_64 (for Linux)
+
+More information for installing on Ubuntu:
+https://wiki.qt.io/Install_Qt_5_on_Ubuntu
+```
+
+4. Download and Build OpenSSL (1.0.1p) - (explained below in section B)
+
+B. Building Robomongo and Dependencies
+-------------
+
+#### Step 1. Build OpenSSL (1.0.1p)
+
+Steps to build OpenSSL on MAC:
+
+  ```sh
+Download openssl-1.0.1p (ftp://ftp.openssl.org/source/old/1.0.1/openssl-1.0.1p.tar.gz)
+tar -xvzf openssl-1.0.1p.tar.gz
+cd /Users/<user>/Downloads/openssl-1.0.1p
+./Configure darwin64-x86_64-cc shared --openssldir="@rpath"
+make (or sudo make)
+mkdir lib
+cp libssl.1.0.0.dylib libcrypto.1.0.0.dylib lib/
+```
+Helper Commands
+  ```sh
+// to start fresh build
+make clean
+```
+
+
+Steps to build OpenSSL on Linux:
+
+  ```sh
+Download openssl-1.0.1p (ftp://ftp.openssl.org/source/old/1.0.1/openssl-1.0.1p.tar.gz)
+tar -xvzf openssl-1.0.1p.tar.gz
+cd /home/<user>/Downloads/openssl-1.0.1p
+./config shared
+make
+mkdir lib
+cp libssl* libcrypto* lib/
+```
+
+#### Step 2. Build Robomongo Shell (fork of MongoDB)
+
+Clone Robomongo Shell and checkout to `roboshell-v3.2` branch:
+
+  ```sh
+  $ git clone https://github.com/paralect/robomongo-shell.git
+  $ cd robomongo-shell
+  $ git checkout roboshell-v3.2
+  ```
+
+Set special environment variable `ROBOMONGO_CMAKE_PREFIX_PATH` to point to a set of 
+directories:
+
+1. Location of Qt 5 SDK  
+2. Location of Robomongo Shell  
+3. Location of OpenSSL  
+
+Separate directories by semicolon `;` (not colon):
+
+    // MAC OSX example:
+    $ export ROBOMONGO_CMAKE_PREFIX_PATH="/path/to/qt-5.7.0/5.7/clang_64;/path/to/robomongo-shell;/path/to/openssl-1.0.1p"
+    // Ubuntu example:
+    $ export ROBOMONGO_CMAKE_PREFIX_PATH="/path/to/qt-5.7.0/5.7/gcc_64;/path/to/robomongo-shell;/path/to/openssl-1.0.1p"
+
+
+Build Robomongo Shell:
+
+  ```sh
+  $ bin/build
+  ```
+
+For more information refer to [Building Robomongo Shell](BuildingMongoDB.md) 
+
+#### Step 3. Build Robomongo

 Download Robomongo: 

    $ git clone https://github.com/paralect/robomongo
    $ cd robomongo

-Set special environment variable `ROBOMONGO_CMAKE_PREFIX_PATH` to point to a set of 
-directories:
-
-1. Location of Qt 5 SDK
-2. Location of Robomongo Shell (built in "Step 1")
-
-Separate directories by semicolon `;` (not colon):
-
-    $ export ROBOMONGO_CMAKE_PREFIX_PATH="/path/to/qt-5.5/5.5/clang_64;/path/to/robomongo-shell"
-    
 Run configuration step:
    
    $ bin/configure 
@@ -30,14 +110,14 @@ Run configuration step:
 And finally, build Robomongo:
    
    $ bin/build 
-    
-<br>    
-## Helper commands

-Execute just built Robomongo:
+To run robomongo:

    $ bin/run
    
+
+**Helper commands**
+    
 Clean build files (in order to start build from scratch):

    $ bin/clean
@@ -49,4 +129,15 @@ Install Robomongo to `build/release/install` folder:
 Create package for your OS in `build/release/package` folder:

    $ bin/pack
-    
+
+**Important Notes**
+- For Ubuntu 16.04 builds, it has been reported that Robomongo /bin/configure step might fail and installing mesa-common-dev package solves it. Details: https://github.com/paralect/robomongo/issues/1268 
+
+- For Centos builds, Robomongo /bin/configure step might fail due to error: `failed to find gl/gl.h`. In this case, the following packages must be installed:
+
+```sh
+$ sudo yum install mesa-libGL
+$ sudo yum install mesa-libGL-devel
+  ```
+
+
@@ -1,7 +1,11 @@
-Building Robomongo for Windows
+Building Robomongo (Windows)
 ==============================

-Prerequisites
+**Important Note:**  
+This document is for versions 1.0 and earlier and for MongoDB 3.2.  
+See latest documents here: https://github.com/Studio3T/robomongo/wiki
+
+A. Prerequisites
 -------------

 #### 0. Git
@@ -64,25 +68,70 @@ Prerequisites
 command will be available from Command Prompt. For this set "Add CMake to the system
 PATH for current user" in the installer wizard page. 
   
-#### 5. Qt 5.5
+#### 5. Qt 5.7

 Download Qt from http://www.qt.io/download-open-source/ (we use Qt Online installer)
   
 When installing Qt, only one component is required by Robomongo: 
   
-    Qt 5.5 
+    Qt 5.7 
      [x] msvc2013 64-bit.
    
 This components contains prebuilt 64-bit binaries for Visual Studio 2013. 
   
 You may uncheck all other components to download as little as possible. 

+#### 6. OpenSSL (1.0.1p)
+Download openssl-1.0.1p (ftp://ftp.openssl.org/source/old/1.0.1/openssl-1.0.1p.tar.gz)
+  
+  

+B. Building Robomongo and Dependencies
+-------------

-## Build Robomongo Shell (fork of MongoDB)
+#### 1. Build OpenSSL (1.0.1p)
+
+Steps to build OpenSSL on windows:
+  ```sh
+Open Visual Studio tool x64 Cross Tools Command prompt
+cd to the directory where you have openssl sources cd c:\myPath\openssl
+perl Configure VC-WIN64A
+ms\do_win64a
+nmake -f ms\ntdll.mak
+```
+
+**Check Point:**
+After successful build, newly created sub directory out32dll should contain dynamic lib files libeay32.lib (and libeay32.dll) and ssleay32.lib (and ssleay32.dll); and associated include files will be in newly created folder "inc32".
+
+Helper Commands:
+  ```sh
+// clean to start fresh build
+nmake -f ms\ntdll.mak clean
+```
+
+Refer to OpenSSL documentation for more information:  
+https://wiki.openssl.org/index.php/Compilation_and_Installation#W64
+
+#### 2. Build Robomongo Shell (fork of MongoDB)
+
+Clone Robomongo Shell and checkout to roboshell-v3.2 branch:
+
+  ```sh
+  $ git clone https://github.com/paralect/robomongo-shell.git
+  $ cd robomongo-shell
+  $ git checkout roboshell-v3.2
+  ```
+
+Set environment variable `ROBOMONGO_CMAKE_PREFIX_PATH`, required by Robomongo-Shell and Robomongo build scripts, needs to be set according to the following directories:
+
+1. Location of Qt SDK
+2. Location of Robomongo Shell
+3. Location of OpenSSL
+
+Separate directories by semicolon `;` (not colon). You can do this in Command Prompt:
+
+    > setx ROBOMONGO_CMAKE_PREFIX_PATH "d:\Qt-5\5.7\msvc2013_64;d:\Projects\robomongo-shell;c:\myPath\openssl-1.0.1p"

-Refer to MongoDB documentation for additional information:
-https://docs.mongodb.org/manual/contributors/tutorial/build-mongodb-from-source/#windows-specific-instructions

 Open VS2013 x64 Native Tools Command Prompt and navigate to `robomongo-shell` folder.

@@ -96,20 +145,19 @@ Clean build files:

    > bin\clean

+Refer to MongoDB documentation for additional information:
+https://docs.mongodb.org/manual/contributors/tutorial/build-mongodb-from-source/#windows-specific-instructions

-## Build Robomongo   

-Set special environment variable `ROBOMONGO_CMAKE_PREFIX_PATH` to point to set of 
-directories:
+#### 3. Build Robomongo   

-1. Location of Qt SDK
-2. Location of Robomongo Shell
+Clone Robomongo:

-Separate directories by semicolon `;` (not colon). You can do this in Command Prompt:
-
-    > setx ROBOMONGO_CMAKE_PREFIX_PATH "d:\Qt-5\5.5\msvc2013_64;d:\Projects\robomongo-shell"
-    
-Reopen your Command Prompt to make this variable available.
+  ```sh
+  $ git clone https://github.com/paralect/robomongo.git
+  ```
+  
+Open VS2013 x64 Native Tools Command Prompt and navigate to `robomongo` folder.
 
 Run configuration step:
    
@@ -118,15 +166,23 @@ Run configuration step:
 And finally, build Robomongo:
    
    > bin\build 
-    
-    
-#### Helper commands
+ 
+
+**Run Robomongo**
+
+Install Robomongo to `build\Release\install` folder:
+
+    > bin\install
+   
+And run Robomongo
+
+    > \robomongo\build\Release\install\Robomongo.exe
+
+**Helper commands**
    
 Clean build files (in order to start build from scratch):

    > bin\clean
    
-Install Robomongo to `build\Release\install` folder:

-    > bin\install
   
@@ -12,19 +12,46 @@ Runtime dependencies that are not privided by platforms but required by Robomong
 Diagnostic of dependencies
 --------------------------

-##### Linux
+### Linux

-View dependencies of executable or shared library:
+a. View dependencies of executable or shared library: 

    $ ldd robomongo
-    
-View RPATH or RUNPATH records of executable or shared library:
+    $ readelf -d robomongo
+
+b. View dependency tree of executable or shared library:  
+
+    $ lddtree robomongo
+    $ ldd -v robomongo
+
+c. View RPATH or RUNPATH records of executable or shared library:

    $ objdump -x bin/robomongo | grep "RPATH\|RUNPATH"
+    $ readelf -d bin/robomongo | grep RPATH     
    
 For Robomongo binary it should be `$ORIGIN/../lib`

-##### Mac OS X
+d. Enable extensive logging for run-time shared library search 
+
+    $ export LD_DEBUG=files
+    $ bin/robomongo
+    
+Source: 
+http://tldp.org/HOWTO/Program-Library-HOWTO/shared-libraries.html
+
+e. Modify RPATH using `chrpath` and the dynamic linker and RPATH using paths `patchelf`
+    
+    $ patchelf --set-rpath '$ORIGIN/../lib' robo
+    
+More: https://nixos.org/patchelf.html
+
+    $ chrpath -r "/somepath/lib/" robomongo
+
+More:
+https://linux.die.net/man/1/chrpath
+http://www.programering.com/a/MTOwcDNwATU.html	// examples
+
+### Mac OS X

 Show dependencies of executable or shared library:

@@ -7,7 +7,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>Robomongo</string>
+	<string>Robo 3T</string>
 	<key>CFBundleGetInfoString</key>
 	<string>${MACOSX_BUNDLE_INFO_STRING}</string>
 	<key>CFBundleIconFile</key>
@@ -14,7 +14,7 @@ File `robomongo.ico` will be generated.
 Which icon sizes are used on Windows?
 =====================================

-The most important sizes are the one that is small. Robomongo should include 
+The most important sizes are the one that is small. Robo 3T should include 
 16, 20, 24, 40, 48. The bigger sizes are usually scaled well, without notable
 degrading in quality. 

@@ -26,14 +26,14 @@ IDI_ICON1               ICON        "@windows_icon@"
 	BEGIN
 		BLOCK "040904e4"
 		BEGIN
-			VALUE "CompanyName", "Paralect, Inc\0"
-			VALUE "FileDescription", "Robomongo, MongoDB management tool\0"
+			VALUE "CompanyName", "3T Software Labs Ltd\0"
+			VALUE "FileDescription", "Robo 3T, MongoDB management tool\0"
 			VALUE "FileVersion", VER_FILEVERSION_STR
-			VALUE "LegalCopyright", "Copyright Paralect, 2013 - 2016\0"
-			VALUE "ProductName", "Robomongo\0"
+			VALUE "LegalCopyright", "Copyright 3T Software Labs Ltd, 2014 - 2017\0"
+			VALUE "ProductName", "Robo 3T\0"
 			VALUE "ProductVersion", VER_PRODUCTVERSION_STR
-			VALUE "OriginalFilename", "Robomongo.exe\0"
-			VALUE "InternalName", "Robomongo\0"
+			VALUE "OriginalFilename", "robo3t.exe\0"
+			VALUE "InternalName", "Robo 3T\0"
 		END
 	END
 	BLOCK "VarFileInfo"
@@ -1,6 +1,6 @@
 Robomongo shortcut key reference
 ================================
-
+"3T", "Robomongo"
 ### Windows/Linux users

   Ctrl+Enter or F5 or Ctrl+R
@@ -0,0 +1,102 @@
+###
+### Unit Testing with Google Test 
+###
+
+## !! Important Note: Currently unit testing is disabled for Linux due to MongoDB linking problem
+if (SYSTEM_LINUX)        
+    message("\n *Note: Currently unit testing is disabled for Linux due to MongoDB linking problem")
+    return()
+endif()
+
+enable_testing()
+include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
+set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+
+## New test & source file pairs MUST have the following format: 
+#  Test file:   /path/Foo_test.cpp
+#  Source file: /path/Foo.cpp or /path/Foo.h
+set(ROBO_SRC_DIR ${CMAKE_HOME_DIRECTORY}/src/robomongo)
+set(SOURCES_TEST
+    ${ROBO_SRC_DIR}/utils/RoboCrypt_test.cpp
+    ${ROBO_SRC_DIR}/utils/StringOperations_test.cpp
+    ${ROBO_SRC_DIR}/core/HexUtils_test.cpp
+)
+
+add_executable(robo_unit_tests ${SOURCES_TEST})
+add_dependencies(robo_unit_tests robomongo)
+
+get_target_property(ROBO_SOURCES robomongo SOURCES)
+list(FILTER ROBO_SOURCES INCLUDE REGEX "cpp")
+list(FILTER ROBO_SOURCES EXCLUDE REGEX "main.cpp")
+
+if(SYSTEM_WINDOWS) ############# Windows 
+    set(OBJ_DIR ${CMAKE_BINARY_DIR}/src/robomongo/robomongo.dir/${CMAKE_BUILD_TYPE}/)
+    set(ROBO_OBJ_FILES "${ROBO_OBJ_FILES}${OBJ_DIR}robomongo_automoc.obj;")
+    set(ROBO_OBJ_FILES "${ROBO_OBJ_FILES}${OBJ_DIR}qrc_gui.obj;")
+    set(ROBO_OBJ_FILES "${ROBO_OBJ_FILES}${OBJ_DIR}qrc_robo.obj;")
+    foreach(SRC_FILE ${ROBO_SOURCES})
+        get_filename_component(FILENAME ${SRC_FILE} NAME)
+        string(REPLACE ".cpp" ".obj" FILENAME ${FILENAME})
+        set(ROBO_OBJ_FILES "${ROBO_OBJ_FILES}${OBJ_DIR}${FILENAME};")        
+    endforeach()
+elseif(SYSTEM_MACOSX) ############# MacOS
+    set(OBJ_DIR ${CMAKE_BINARY_DIR}/src/robomongo/CMakeFiles/robomongo.dir/)
+    set(ROBO_OBJ_FILES "${ROBO_OBJ_FILES}${OBJ_DIR}/robomongo_autogen/mocs_compilation.cpp.o;")
+    set(ROBO_OBJ_FILES "${ROBO_OBJ_FILES}${OBJ_DIR}/robomongo_autogen/YHP5W5E6RA/qrc_gui.cpp.o;")
+    set(ROBO_OBJ_FILES "${ROBO_OBJ_FILES}${OBJ_DIR}/robomongo_autogen/3YJK5W5UP7/qrc_robo.cpp.o;")
+    foreach(SRC_FILE ${ROBO_SOURCES})
+        string(REPLACE ".cpp" ".cpp.o" OBJ_FILE ${SRC_FILE})
+        set(ROBO_OBJ_FILES "${ROBO_OBJ_FILES}${OBJ_DIR}${OBJ_FILE};")        
+    endforeach()
+
+    find_library(SECURITY NAMES Security)
+    find_library(CORE_FOUNDATION NAMES CoreFoundation)
+    set(SSL_LIBRARIES ${SECURITY} ${CORE_FOUNDATION})
+
+    target_link_libraries(robo_unit_tests 
+        ${SSL_LIBRARIES} -lresolv
+    )
+# elseif(SYSTEM_LINUX) ############# LINUX  
+#     set(OBJ_DIR ${CMAKE_BINARY_DIR}/src/robomongo/CMakeFiles/robomongo.dir/)
+#     message("--- OBJ_DIR: " ${OBJ_DIR})
+#     set(ROBO_OBJ_FILES "${ROBO_OBJ_FILES}${OBJ_DIR}/robomongo_automoc.cpp.o;")
+#     set(ROBO_OBJ_FILES "${ROBO_OBJ_FILES}${OBJ_DIR}/robomongo_automoc.dir/gui/resources/qrc_gui.cpp.o;")
+#     set(ROBO_OBJ_FILES "${ROBO_OBJ_FILES}${OBJ_DIR}/robomongo_automoc.dir/resources/qrc_robo.cpp.o;")    
+#     foreach(SRC_FILE ${ROBO_SOURCES})
+#         string(REPLACE ".cpp" ".cpp.o" OBJ_FILE ${SRC_FILE})
+#         set(ROBO_OBJ_FILES "${ROBO_OBJ_FILES}${OBJ_DIR}${OBJ_FILE};")        
+#     endforeach()
+endif()
+
+target_link_libraries(robo_unit_tests 
+    gtest gtest_main
+    Qt5::Widgets
+    Qt5::Network
+    Qt5::Xml
+    qjson
+    qscintilla
+    mongodb
+    ssh
+    Threads::Threads
+    ${ROBO_OBJ_FILES}
+)
+
+target_include_directories(robo_unit_tests
+    PRIVATE
+        ${CMAKE_HOME_DIRECTORY}/src)
+
+# For Windows we need to install Qt DLLs
+if(SYSTEM_WINDOWS)
+    get_target_property(target_path Qt5::Core LOCATION)
+    get_filename_component(qt_bin_dir ${target_path} DIRECTORY)
+    set(QT_BIN_FILES "${QT_BIN_FILES}" ${qt_bin_dir}/Qt5Core${CMAKE_SHARED_LIBRARY_SUFFIX};)
+    set(QT_BIN_FILES "${QT_BIN_FILES}" ${qt_bin_dir}/Qt5Gui${CMAKE_SHARED_LIBRARY_SUFFIX};)
+    set(QT_BIN_FILES "${QT_BIN_FILES}" ${qt_bin_dir}/Qt5Network${CMAKE_SHARED_LIBRARY_SUFFIX};)
+    set(QT_BIN_FILES "${QT_BIN_FILES}" ${qt_bin_dir}/Qt5PrintSupport${CMAKE_SHARED_LIBRARY_SUFFIX};)
+    set(QT_BIN_FILES "${QT_BIN_FILES}" ${qt_bin_dir}/Qt5Widgets${CMAKE_SHARED_LIBRARY_SUFFIX};)
+    set(QT_BIN_FILES "${QT_BIN_FILES}" ${qt_bin_dir}/Qt5Xml${CMAKE_SHARED_LIBRARY_SUFFIX};)
+
+    get_target_property(TESTS_BIN_DIR robo_unit_tests BINARY_DIR)
+    file(COPY ${QT_BIN_FILES}
+        DESTINATION ${TESTS_BIN_DIR}/${CMAKE_BUILD_TYPE})
+endif()
@@ -5,6 +5,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

+#set(sanitize "-fsanitize=address")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${sanitize}")
+#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${sanitize}")
+
 set(SOURCES

    # Isolated Scope #1
@@ -24,14 +28,11 @@ set(SOURCES
    core/EventBus.cpp
    core/KeyboardManager.cpp
    core/domain/MongoNamespace.cpp
-    core/domain/MongoUser.cpp
-    core/domain/MongoUser.cpp
    core/domain/MongoFunction.cpp
    core/domain/MongoUtils.cpp
    core/domain/MongoCollection.cpp
    core/domain/MongoCollectionInfo.cpp
    core/domain/MongoQueryInfo.cpp
-    core/domain/MongoShellResult.cpp
    core/domain/CursorPosition.cpp
    core/domain/ScriptInfo.cpp
    core/events/MongoEventsInfo.cpp
@@ -49,12 +50,18 @@ set(SOURCES
    core/domain/App.cpp
    core/mongodb/MongoClient.cpp
    core/mongodb/MongoWorker.cpp
+    core/mongodb/ReplicaSet.cpp
    core/settings/SettingsManager.cpp
    core/AppRegistry.cpp
+    utils/StringOperations.cpp
+    utils/common.cpp
+    utils/SimpleCrypt.cpp
+    utils/RoboCrypt.cpp

    # Isolated Scope #3
    gui/GuiRegistry.cpp
    gui/dialogs/AboutDialog.cpp
+    gui/dialogs/EulaDialog.cpp
    gui/dialogs/ConnectionAdvancedTab.cpp
    gui/dialogs/ConnectionAuthTab.cpp
    gui/dialogs/ConnectionBasicTab.cpp
@@ -62,6 +69,7 @@ set(SOURCES
    gui/dialogs/ConnectionDialog.cpp
    gui/dialogs/CopyCollectionDialog.cpp
    gui/widgets/workarea/IndicatorLabel.cpp
+    gui/dialogs/CreateCollectionDialog.cpp
    gui/dialogs/CreateDatabaseDialog.cpp
    gui/dialogs/CreateUserDialog.cpp
    gui/utils/ComboBoxUtils.cpp
@@ -70,6 +78,9 @@ set(SOURCES
    # Isolated scope #4
    gui/dialogs/PreferencesDialog.cpp
    gui/dialogs/ConnectionsDialog.cpp
+    gui/dialogs/CreateConnectionDialog.cpp
+    gui/dialogs/ExportDialog.cpp
+    gui/dialogs/ChangeShellTimeoutDialog.cpp

    # Isolated scope #5
    gui/editors/PlainJavaScriptEditor.cpp
@@ -81,6 +92,8 @@ set(SOURCES
    # Isolated scope #6
    gui/widgets/explorer/ExplorerCollectionTreeItem.cpp
    gui/widgets/explorer/ExplorerTreeItem.cpp
+    gui/widgets/explorer/ExplorerReplicaSetFolderItem.cpp
+    gui/widgets/explorer/ExplorerReplicaSetTreeItem.cpp
    gui/widgets/explorer/ExplorerDatabaseTreeItem.cpp
    gui/widgets/explorer/ExplorerDatabaseCategoryTreeItem.cpp
    gui/widgets/explorer/ExplorerUserTreeItem.cpp
@@ -111,37 +124,55 @@ set(SOURCES
    gui/widgets/workarea/QueryWidget.cpp
    gui/widgets/workarea/WorkAreaTabBar.cpp
    gui/widgets/workarea/WorkAreaTabWidget.cpp
+    gui/widgets/workarea/WelcomeTab.cpp

    # Final scope
    gui/widgets/LogWidget.cpp
    gui/MainWindow.cpp

    gui/dialogs/SSHTunnelTab.cpp
+    gui/dialogs/SSLTab.cpp
    core/settings/SshSettings.cpp
+    core/settings/SslSettings.cpp
+    core/settings/ReplicaSetSettings.cpp
    core/mongodb/SshTunnelWorker.cpp

+    resources/robo.qrc
    gui/resources/gui.qrc
 )

-
 # Robomongo target
 add_executable(robomongo MACOSX_BUNDLE WIN32 app/main.cpp ${SOURCES})

 target_link_libraries(robomongo
    PRIVATE
        Qt5::Widgets
+        Qt5::Network
+        Qt5::Xml
        qjson
        qscintilla
        mongodb
        ssh
        Threads::Threads)   # Target from FindThreads CMake module

+if(APPLE)
+  find_library(SECURITY NAMES Security)
+  find_library(CORE_FOUNDATION NAMES CoreFoundation)
+  set(SSL_LIBRARIES ${SECURITY} ${CORE_FOUNDATION})
+  
+  target_link_libraries(robomongo
+    PRIVATE
+        ${SSL_LIBRARIES}
+        -lresolv)
+endif(APPLE)
+
 target_include_directories(robomongo
    PRIVATE
        ${CMAKE_HOME_DIRECTORY}/src)

 target_compile_definitions(robomongo
    PRIVATE
+        BUILDING_ROBO
        PROJECT_NAME="${PROJECT_NAME}"
        PROJECT_NAME_TITLE="${PROJECT_NAME_TITLE}"
        PROJECT_COPYRIGHT="${PROJECT_COPYRIGHT}"
@@ -151,6 +182,8 @@ target_compile_definitions(robomongo
        PROJECT_GITHUB_FORK="${PROJECT_GITHUB_FORK}"
        PROJECT_GITHUB_ISSUES="${PROJECT_GITHUB_ISSUES}"
        PROJECT_VERSION="${PROJECT_VERSION}"
+        PROJECT_VERSION_SHORT="${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
+        PROJECT_QT_VERSION="${Qt5Core_VERSION}"
        PROJECT_NAME_LOWERCASE="${PROJECT_NAME_LOWERCASE}")

 if(SYSTEM_WINDOWS)
@@ -168,7 +201,7 @@ if(SYSTEM_WINDOWS)

    # Rename output name for Windows
    set_target_properties(robomongo PROPERTIES
-        OUTPUT_NAME "Robomongo")
+        OUTPUT_NAME "robo3t")

    # Seems that we do not need to do this with recent versions of Qt
    target_link_libraries(robomongo
@@ -178,29 +211,28 @@ if(SYSTEM_WINDOWS)
 elseif(SYSTEM_MACOSX)
    set_target_properties(robomongo PROPERTIES
        INSTALL_RPATH "@executable_path/../Frameworks"
-        OUTPUT_NAME "Robomongo"
+        OUTPUT_NAME "Robo 3T"
        MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/install/macosx/Info.plist.in"
-        MACOSX_BUNDLE_BUNDLE_NAME "Robomongo"
-        MACOSX_BUNDLE_GUI_IDENTIFIER "com.paralect.Robomongo"
-        MACOSX_BUNDLE_INFO_STRING "Robomongo ${PROJECT_VERSION}. Copyright Paralect, 2013 - 2016"
+        MACOSX_BUNDLE_BUNDLE_NAME "Robo 3T"
+        MACOSX_BUNDLE_GUI_IDENTIFIER "com.3tsoftwarelabs.robo3t"
+        MACOSX_BUNDLE_INFO_STRING "Robo 3T ${PROJECT_VERSION}. Copyright 3T Software Labs Ltd, 2014 - 2017"
        MACOSX_BUNDLE_SHORT_VERSION "${PROJECT_VERSION}"
        MACOSX_BUNDLE_LONG_VERSION "${PROJECT_VERSION}"
        MACOSX_BUNDLE_BUNDLE_VERSION "${PROJECT_VERSION}"
-        MACOSX_BUNDLE_COPYRIGHT "Copyright Paralect, 2013 - 2016"
-        MACOSX_BUNDLE_ICON_FILE "Robomongo")
+        MACOSX_BUNDLE_COPYRIGHT "Copyright 3T Software Labs Ltd, 2014 - 2017"
+        MACOSX_BUNDLE_ICON_FILE "robomongo")

 elseif(SYSTEM_LINUX)
    set_target_properties(robomongo PROPERTIES
-        INSTALL_RPATH "$ORIGIN/../lib")
+        INSTALL_RPATH "$ORIGIN/../lib"
+        OUTPUT_NAME "robo3t")
 endif()

 # Install
 include(RobomongoInstall)

-
 #
 # Tests targets (code below should be moved to separate file)
-#
 add_executable(tests WIN32 EXCLUDE_FROM_ALL app/main_test.cpp gui/editors/JSLexer.cpp)
 target_link_libraries(tests Qt5::Widgets qjson qscintilla mongodb Threads::Threads)
 target_include_directories(tests
@@ -6,20 +6,27 @@
 // Header "mongo/util/net/sock" is needed for mongo::enableIPv6()
 // Header "mongo/platform/basic" is required by "sock.h" under Windows
 #include <mongo/platform/basic.h>
-#include <mongo/util/net/sock.h>
-
+#include <mongo/util/net/socket_utils.h>
 #include <mongo/base/initializer.h>
+#include <mongo/util/net/ssl_options.h>
+#include <mongo/db/service_context.h>
+#include <mongo/transport/transport_layer_asio.h>
+#include <mongo/shell/shell_options.h>
+#include <mongo/db/storage/storage_engine_init.h>

+#include "robomongo/core/AppRegistry.h"
+#include "robomongo/core/settings/SettingsManager.h"
+#include "robomongo/core/utils/Logger.h"       
 #include "robomongo/gui/MainWindow.h"
 #include "robomongo/gui/AppStyle.h"
-
+#include "robomongo/gui/dialogs/EulaDialog.h"
 #include "robomongo/ssh/ssh.h"
+#include "robomongo/utils/RoboCrypt.h"       

 int main(int argc, char *argv[], char** envp)
 {
-    if (rbm_ssh_init()) {
+    if (rbm_ssh_init()) 
        return 1;
-    }

    // Please check, do we really need envp for other OSes?
 #ifdef Q_OS_WIN
@@ -29,8 +36,25 @@ int main(int argc, char *argv[], char** envp)
    // Support for IPv6 is disabled by default. Enable it.
    mongo::enableIPv6(true);

+    // Perform SSL-enabled mongo initialization
+    mongo::sslGlobalParams.sslMode.store(mongo::SSLParams::SSLMode_allowSSL);
+
+    // Cross Platform High DPI support - Qt 5.7
+    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+
    // Initialization routine for MongoDB shell
    mongo::runGlobalInitializersOrDie(argc, argv, envp);
+    mongo::setGlobalServiceContext(mongo::ServiceContext::make());
+    // Todo from mongo repo: This should use a TransportLayerManager or TransportLayerFactory
+    auto serviceContext = mongo::getGlobalServiceContext();
+    mongo::transport::TransportLayerASIO::Options opts;
+    opts.enableIPv6 = mongo::shellGlobalParams.enableIPv6;
+    opts.mode = mongo::transport::TransportLayerASIO::Options::kEgress;
+    serviceContext->setTransportLayer(
+        std::make_unique<mongo::transport::TransportLayerASIO>(opts, nullptr));
+    auto tlPtr = serviceContext->getTransportLayer();
+    uassertStatusOK(tlPtr->setup());
+    uassertStatusOK(tlPtr->start());    

    // Initialize Qt application
    QApplication app(argc, argv);
@@ -39,30 +63,57 @@ int main(int argc, char *argv[], char** envp)
    // This can cause a conflict when using POSIX functions, for instance, when
    // converting between data types such as floats and strings, since the notation
    // may differ between locales. To get around this problem, call the POSIX
-    // function setlocale(LC_NUMERIC,"C") right after initializing QApplication or
+    // function setlocale(LC_NUMERIC, "C") right after initializing QApplication or
    // QCoreApplication to reset the locale that is used for number formatting to "C"-locale.
    // (http://doc.qt.io/qt-5/qcoreapplication.html#locale-settings)
    setlocale(LC_NUMERIC, "C");

+#ifdef Q_OS_MAC
+    app.setAttribute(Qt::AA_UseHighDpiPixmaps);
+#endif
+
+    auto const& settingsManager = Robomongo::AppRegistry::instance().settingsManager();    
+    // Disable HTTPS and do not show EULA form if program exited abnormally
+    bool showEulaDialogForm = true;
+    if (!settingsManager->programExitedNormally()) {
+        showEulaDialogForm = false;
+        settingsManager->setUseHttps(false);
+        settingsManager->save();
+    }
+    
+    if (!settingsManager->useHttps())
+        showEulaDialogForm = false;
+    
+    // EULA License Agreement
+    if (!settingsManager->acceptedEulaVersions().contains(PROJECT_VERSION)) {
+        Robomongo::EulaDialog eulaDialog(showEulaDialogForm);
+        settingsManager->setProgramExitedNormally(false);
+        settingsManager->save();
+        int const result = eulaDialog.exec();
+        settingsManager->setProgramExitedNormally(true);
+        settingsManager->save();
+        if (QDialog::Rejected == result) {
+            rbm_ssh_cleanup();
+            return 1;
+        }
+        // EULA accepted
+        settingsManager->addAcceptedEulaVersion(PROJECT_VERSION);
+        settingsManager->save();
+    }  
+
    // Init GUI style
    Robomongo::AppStyleUtils::initStyle();

+    // To be set true at normal program exit
+    settingsManager->setProgramExitedNormally(false);
+    settingsManager->save();
+
    // Application main window
-    Robomongo::MainWindow win;
+    Robomongo::MainWindow mainWindow;
+    mainWindow.show();

-    // Resize main window. We are trying to keep it "almost" maximized.
-    QRect screenGeometry = QApplication::desktop()->availableGeometry();
-    int horizontalMargin = (int)(screenGeometry.width() * 0.1);
-    int verticalMargin = (int)(screenGeometry.height() * 0.1);
-    int width = screenGeometry.width() - horizontalMargin;
-    int height = screenGeometry.height() - verticalMargin;
-    win.resize(QSize(width, height));
-
-    // Center main window
-    int x = (screenGeometry.width() - win.width()) / 2;
-    int y = (screenGeometry.height() - win.height()) / 2;
-    win.move(x, y);
-    win.show();
+    for(auto const& msgAndSeverity : Robomongo::RoboCrypt::roboCryptLogs())
+        Robomongo::LOG_MSG(msgAndSeverity.first, msgAndSeverity.second);

    int rc = app.exec();
    rbm_ssh_cleanup();
@@ -33,12 +33,19 @@ void precisionAssert(const std::string &text, double d) {
    std::stringstream s;
    s.precision(std::numeric_limits<double>::digits10);
    s << d;
+    if (d == (long long)d)
+        s << ".0";
    std::cout << "Checking " << text << " - ";
    assert(text == s.str());
    std::cout << "Correct. " << std::endl;
 }

 void testPrecision() {
+    precisionAssert("-9.987654321", -9.987654321);
+    precisionAssert("-1.0", -1.0);
+    precisionAssert("-0.0", -0.0);
+    precisionAssert("0.0", 0.0);
+    precisionAssert("9.0", 9.0);
    precisionAssert("9.8", 9.8);
    precisionAssert("9.9", 9.9);
    precisionAssert("9.98", 9.98);
@@ -30,4 +30,20 @@ namespace Robomongo

    class MongoDocument;
    typedef boost::shared_ptr<MongoDocument> MongoDocumentPtr;
+
+    enum ConnectionType {
+        // This type of connection is shown in Explorer and also opens SSH tunnel for secondary 
+        // connections (if needed)
+        ConnectionPrimary      = 0,
+
+        // Never shown in Explorer and uses SSH tunnel from primary connection (if needed)
+        ConnectionSecondary    = 1,
+
+        // The same as Primary, but is specifically for testing connections.
+        ConnectionTest         = 2,
+
+        // Never shown in Explorer and can be used to refresh (via reconnecting) current connection view 
+        // (i.e. db version, storage engine, current replica set primary, status of replica set etc...)
+        ConnectionRefresh      = 3
+    };
 }
@@ -10,9 +10,9 @@ namespace
    template<typename type, int size>
    inline type findTypeInArray(const char *(&arr)[size], const char *text)
    {
-        for (int i=0; i < size;++i )
+        for (int i = 0; i < size; ++i )
        {
-            if (strcmp(text,arr[i])==0)
+            if (strcmp(text, arr[i]) == 0)
            {
                return static_cast<type>(i);
            }
@@ -1,19 +1,35 @@
 #include "robomongo/core/EventError.h"

+#include "robomongo/utils/StringOperations.h"
+
 namespace Robomongo
 {
    EventError::EventError() :
        _isNull(true) {}

-    EventError::EventError(const std::string &errorMessage) :
-        _errorMessage(errorMessage),
+    EventError::EventError(const std::string &errorMessage, ErrorCode errorCode /*= Unknown*/,
+                           bool showErrorWindow /* = true */) :
+        _errorMessage(captilizeFirstChar(errorMessage)),
+        _errorCode(errorCode),
+        _showErrorWindow(showErrorWindow),
        _isNull(false) {}

-    bool EventError::isNull() const {
+    EventError::EventError(const std::string &errorMessage, ReplicaSet const& replicaSetInfo, 
+                           bool showErrorWindow /* = true */ ) :
+        _errorMessage(errorMessage), 
+        _errorCode(SetPrimaryUnreachable),
+        _replicaSetInfo(replicaSetInfo),
+        _showErrorWindow(showErrorWindow),
+        _isNull(false) {}
+
+    bool EventError::isNull() const
+    {
        return _isNull;
    }

-    const std::string &EventError::errorMessage() const {
+    const std::string &EventError::errorMessage() const 
+    {
        return _errorMessage;
    }
+
 }
@@ -1,6 +1,8 @@
 #pragma once
 #include <string>

+#include "robomongo/core/mongodb/ReplicaSet.h"
+
 namespace Robomongo
 {
    /**
@@ -10,7 +12,11 @@ namespace Robomongo
     */
    class EventError
    {
+
    public:
+
+        enum ErrorCode { Unknown, SetPrimaryUnreachable, ServerHasDifferentMembers };
+
        /**
         * @brief Creates "null" (or, in other words, empty) error.
         * Subsequent call of isNull() on this object will return true.
@@ -21,7 +27,14 @@ namespace Robomongo
         * @brief Creates error object with specified error message.
         * Subsequent call of isNull() on this object will return false.
         */
-        explicit EventError(const std::string &errorMessage);
+        explicit EventError(const std::string &errorMessage, ErrorCode errorCode = Unknown, 
+                            bool showErrorWindow = true);
+        
+        /**
+        * @brief Creates error object only for replica set connection failures
+        */
+        explicit EventError(const std::string &errorMessage, ReplicaSet const& replicaSetInfo, 
+                            bool showErrorWindow = true);

        /**
         * @brief Tests whether error is "null" (or, in other words, empty).
@@ -35,13 +48,19 @@ namespace Robomongo
         * @brief Returns error message that describes this error.
         */
        const std::string &errorMessage() const;
+        
+        ErrorCode errorCode() const { return _errorCode; }
+        ReplicaSet replicaSetInfo() const { return _replicaSetInfo; }
+        bool showErrorWindow() const { return _showErrorWindow; }

    private:
        /**
         * @brief Error message
         */
-        const std::string _errorMessage;
-
-        bool _isNull;
+        std::string const _errorMessage;
+        ErrorCode const _errorCode = Unknown;
+        ReplicaSet const _replicaSetInfo;
+        bool const _showErrorWindow = true;
+        bool const _isNull;
    };
 }
@@ -36,8 +36,8 @@ namespace Robomongo
            char *data = new char[bytes];

            const char *p = s.c_str();
-            for( size_t i = 0; i < bytes; i++ ) {
-                data[i] = mongo::fromHex(p);
+            for (size_t i = 0; i < bytes; i++) {
+                data[i] = mongo::fromHex(p).getValue();
                p += 2;
            }

@@ -159,7 +159,7 @@ namespace Robomongo
            mongo::BinDataType binType = element.binDataType();

            if (binType != mongo::newUUID && binType != mongo::bdtUUID)
-                throw new std::invalid_argument("Binary subtype should be 3 (bdtUUID) or 4 (newUUID)");
+                throw std::invalid_argument("Binary subtype should be 3 (bdtUUID) or 4 (newUUID)");

            int len;
            const char *data = element.binData(len);
@@ -0,0 +1,19 @@
+#include "gtest/gtest.h"
+#include "HexUtils.h"
+
+#include <string>
+
+/* Example Test:
+*
+* TEST( [Test_Case_Name], [Test_Name] )
+* TEST( [Test_Case_Name], [UnitOfWorkName_ScenarioUnderTest_ExpectedBehavior] )
+* TEST( StringParserTests, NumberLeftOf_StringWithoutNumber_ReturnsFalse) {
+// ...
+}
+*/
+
+TEST(hex_utils_tests, test_1)
+{
+    EXPECT_TRUE(Robomongo::HexUtils::isHexString("a"));
+}
+
@@ -1,11 +1,14 @@
 #include "robomongo/core/domain/App.h"
 #include <QHash>
+#include <QInputDialog>

 #include "robomongo/core/domain/MongoServer.h"
 #include "robomongo/core/domain/MongoShell.h"
 #include "robomongo/core/domain/MongoCollection.h"
 #include "robomongo/core/settings/ConnectionSettings.h"
+#include "robomongo/core/settings/ReplicaSetSettings.h"
 #include "robomongo/core/settings/SshSettings.h"
+#include "robomongo/core/settings/SslSettings.h"
 #include "robomongo/core/mongodb/SshTunnelWorker.h"
 #include "robomongo/core/EventBus.h"
 #include "robomongo/core/utils/QtUtils.h"
@@ -33,7 +36,7 @@ namespace Robomongo
    }

    App::App(EventBus *const bus) : QObject(),
-        _bus(bus) {
+        _bus(bus), _lastServerHandle(0) {
        _bus->subscribe(this, EstablishSshConnectionResponse::Type);
        _bus->subscribe(this, ListenSshConnectionResponse::Type);
        _bus->subscribe(this, LogEvent::Type);
@@ -45,29 +48,84 @@ namespace Robomongo
        std::for_each(_servers.begin(), _servers.end(), stdutils::default_delete<MongoServer*>());
    }

+    bool App::openServer(ConnectionSettings *connection, ConnectionType type) {
+
+        SshSettings *ssh = connection->sshSettings();
+
+        if (ssh->enabled() && ssh->askPassword() &&
+            (type == ConnectionPrimary || type == ConnectionTest)) {
+            bool ok = false;
+
+            bool isByKey = ssh->authMethod() == "publickey";
+            std::string passText = isByKey ? "passphrase" : "password";
+
+            std::stringstream s;
+            s << "In order to continue, please provide the " << passText;
+
+            if (isByKey)
+                s << " for the key file";
+
+            s << "." << std::endl << std::endl;
+
+            if (ssh->authMethod() == "publickey")
+                s << "Private Key:  " << ssh->privateKeyFile() << std::endl;
+
+            s << "Server: " << ssh->host() << std::endl;
+            s << "User: " << ssh->userName() << std::endl;
+
+
+            s << std::endl << "Enter your " << passText << " that will never be stored:";
+
+            QString userInput = QInputDialog::getText(NULL, tr("SSH Authentication"),
+                QtUtils::toQString(s.str()),
+                QLineEdit::Password, "", &ok);
+
+            if (!ok)
+                return false;
+
+            ssh->setAskedPassword(QtUtils::toStdString(userInput));
+        }
+
+        SslSettings *sslSettings = connection->sslSettings();
+
+        if (sslSettings->sslEnabled() && sslSettings->usePemFile() && sslSettings->askPassphrase() 
+            && (type == ConnectionPrimary || type == ConnectionTest)) 
+        {
+            if (!askSslPassphrasePromptDialog(connection))
+            {
+                return false;
+            }
+        }
+
+        openServerInternal(connection, type);
+        return true;
+    }
+
    /**
     * Creates and opens new server connection.
     * @param connection: ConnectionSettings, that will be owned by MongoServer.
     * @param visible: should this server be visible in UI (explorer) or not.
     */
-    MongoServer *App::openServer(ConnectionSettings *connection, bool visible) {
-        if (visible)
+    MongoServer *App::openServerInternal(ConnectionSettings* connSettings, ConnectionType type) {
+        ++_lastServerHandle;
+
+        if (type == ConnectionPrimary)
            _bus->publish(new ConnectingEvent(this));

-        // When connection is not "visible" or do not have
+        // When connection is SECONDARY or do not have
        // ssh settings enabled, continue without SSH Tunnel
-        if (!visible || !connection->sshSettings()->enabled()) {
-            return continueOpenServer(connection, visible);
+        if (type == ConnectionSecondary || !connSettings->sshSettings()->enabled()) {
+            return continueOpenServer(_lastServerHandle, connSettings, type);
        }

        // Open SSH channel and only after that open connection
        LOG_MSG(QString("Creating SSH tunnel to %1:%2...")
-            .arg(QtUtils::toQString(connection->sshSettings()->host()))
-            .arg(connection->sshSettings()->port()), mongo::logger::LogSeverity::Info());
+            .arg(QtUtils::toQString(connSettings->sshSettings()->host()))
+            .arg(connSettings->sshSettings()->port()), mongo::logger::LogSeverity::Info());

-        ConnectionSettings* settingsCopy = connection->clone();
+        ConnectionSettings* settingsCopy = connSettings->clone();
        SshTunnelWorker* sshWorker = new SshTunnelWorker(settingsCopy);
-        _bus->send(sshWorker, new EstablishSshConnectionRequest(this, sshWorker, settingsCopy, visible));
+        _bus->send(sshWorker, new EstablishSshConnectionRequest(this, _lastServerHandle, sshWorker, settingsCopy, type));
        return NULL;
    }

@@ -77,46 +135,55 @@ namespace Robomongo
     */
    void App::closeServer(MongoServer *server)
    {
-        _servers.erase(std::remove_if(_servers.begin(), _servers.end(), stdutils::RemoveIfFound<MongoServer*>(server)), _servers.end());
+        _servers.erase(std::remove_if(_servers.begin(), _servers.end(), stdutils::RemoveIfFound<MongoServer*>(server)), 
+                       _servers.end());
    }

-    MongoShell *App::openShell(MongoCollection *collection,const QString &filePathToSave)
+    void App::openShell(MongoCollection *collection, const QString &filePathToSave)
    {
        ConnectionSettings *connection = collection->database()->server()->connectionRecord();
-        connection->setDefaultDatabase(collection->database()->name());
-        QString script = detail::buildCollectionQuery(collection->name(), "find({})");
-        return openShell(connection, ScriptInfo(script, true, CursorPosition(0, -2), QtUtils::toQString(collection->database()->name()),filePathToSave));
+        auto const& dbname = collection->database()->name();
+        connection->setDefaultDatabase(dbname);
+        QString const& script = detail::buildCollectionQuery(collection->name(), "find({})");
+        openShell(collection->database()->server(), connection, ScriptInfo(script, true, dbname, CursorPosition(0, -2),
+                                                                           QtUtils::toQString(dbname), filePathToSave));
    }

-    MongoShell *App::openShell(MongoServer *server,const QString &script, const std::string &dbName,
+    void App::openShell(MongoServer *server, const QString &script, const std::string &dbName,
                               bool execute, const QString &shellName,
-                               const CursorPosition &cursorPosition,const QString &filePathToSave)
+                               const CursorPosition &cursorPosition, const QString &filePathToSave)
    {
        ConnectionSettings *connection = server->connectionRecord();

        if (!dbName.empty())
            connection->setDefaultDatabase(dbName);

-        return openShell(connection, ScriptInfo(script, execute, cursorPosition, shellName,filePathToSave));
+        openShell(server, connection, ScriptInfo(script, execute, dbName, cursorPosition, shellName, filePathToSave));
    }

-    MongoShell *App::openShell(MongoDatabase *database, const QString &script,
+    void App::openShell(MongoDatabase *database, const QString &script,
                               bool execute, const QString &shellName,
-                               const CursorPosition &cursorPosition,const QString &filePathToSave)
+                               const CursorPosition &cursorPosition, const QString &filePathToSave)
    {
        ConnectionSettings *connection = database->server()->connectionRecord();
        connection->setDefaultDatabase(database->name());
-        return openShell(connection, ScriptInfo(script, execute, cursorPosition, shellName,filePathToSave));
+        openShell(database->server(), connection, ScriptInfo(script, execute, database->name(), 
+                                                             cursorPosition, shellName, filePathToSave));
    }

-    MongoShell *App::openShell(ConnectionSettings *connection, const ScriptInfo &scriptInfo)
+    void App::openShell(MongoServer* server, ConnectionSettings* connection, const ScriptInfo &scriptInfo)
    {
-        MongoServer *server = openServer(connection, false);
-        MongoShell *shell = new MongoShell(server,scriptInfo);
+        MongoServer *serverClone = openServerInternal(connection, ConnectionSecondary);
+        if (!serverClone || !server)
+            return;
+
+        MongoShell *shell = new MongoShell(serverClone, scriptInfo);
+        // Connection between explorer's server and tab's MongoShells
+        _bus->subscribe(server, ReplicaSetRefreshed::Type, shell); 
        _shells.push_back(shell);
        _bus->publish(new OpeningShellEvent(this, shell));
        shell->execute();
-        return shell;
+        return;
    }

    /**
@@ -126,7 +193,7 @@ namespace Robomongo
    void App::closeShell(MongoShell *shell)
    {
        // Do nothing, if this shell not owned by this App.
-        MongoShellsContainerType::iterator it = std::find_if(_shells.begin(),_shells.end(),std::bind1st(std::equal_to<MongoShell *>(),shell));
+        MongoShellsContainerType::iterator it = std::find_if(_shells.begin(), _shells.end(), std::bind1st(std::equal_to<MongoShell *>(), shell));
        if (it == _shells.end())
            return;

@@ -135,57 +202,103 @@ namespace Robomongo
        delete shell;
    }

-    MongoServer* App::continueOpenServer(ConnectionSettings *connection, bool visible, int localport) {
-        ConnectionSettings* settings = connection->clone();
+    MongoServer *App::continueOpenServer(int serverHandle, ConnectionSettings* connSettings, ConnectionType type, 
+                                         int localport) 
+    {
+        ConnectionSettings* connSettingsClone = connSettings->clone();

        // Modify connection settings when SSH tunnel is used
-        if (visible && settings->sshSettings()->enabled()) {
-            settings->setServerHost("127.0.0.1");
-            settings->setServerPort(localport);
+        if ((type == ConnectionPrimary || type == ConnectionTest)
+            && connSettingsClone->sshSettings()->enabled()) {
+            connSettingsClone->setServerHost("127.0.0.1");
+            connSettingsClone->setServerPort(localport);
        }

-        MongoServer *server = new MongoServer(settings, visible);
+        MongoServer *server = new MongoServer(serverHandle, connSettingsClone, type);
        _servers.push_back(server);

        server->runWorkerThread();

-        LOG_MSG(QString("Connecting to %1...").arg(QtUtils::toQString(server->connectionRecord()->getFullAddress())), mongo::logger::LogSeverity::Info());
+        auto replicaSetStr = QString::fromStdString(connSettings->connectionName()) + " [Replica Set]";
+        replicaSetStr = (connSettings->replicaSetSettings()->members().size() > 0) 
+                        ? replicaSetStr + QString::fromStdString(connSettings->replicaSetSettings()->members()[0])
+                        : replicaSetStr + "";
+        
+        QString serverAddress = connSettings->isReplicaSet()
+                                ? replicaSetStr
+                                : QString::fromStdString(connSettings->getFullAddress());
+
+        LOG_MSG(QString("Connecting to %1...").arg(serverAddress), mongo::logger::LogSeverity::Info());
        server->tryConnect();
        return server;
    }

    void App::handle(EstablishSshConnectionResponse *event) {
        if (event->isError()) {
-            _bus->publish(new ConnectionFailedEvent(this, event->error().errorMessage()));
+            _bus->publish(new ConnectionFailedEvent(
+                this, event->serverHandle, event->connectionType, event->error().errorMessage(),
+                ConnectionFailedEvent::SshConnection));
            return;
        }

        LOG_MSG(QString("SSH tunnel created successfully"), mongo::logger::LogSeverity::Info());

-        _bus->send(event->worker, new ListenSshConnectionRequest(this));
-        continueOpenServer(event->settings, event->visible, event->localport);
-
-        // record event->worker and delete when needed
+        continueOpenServer(event->serverHandle, event->settings, event->connectionType, event->localport);
+        _bus->send(event->worker, new ListenSshConnectionRequest(this, event->serverHandle, event->connectionType));
    }

    void App::handle(LogEvent *event) {
-        if (event->level == LogEvent::ERROR) {
+        if (event->level == LogEvent::RBM_ERROR) {
            LOG_MSG(event->message, mongo::logger::LogSeverity::Error());
-        } else if (event->level == LogEvent::WARN) {
+        } else if (event->level == LogEvent::RBM_WARN) {
            LOG_MSG(event->message, mongo::logger::LogSeverity::Warning());
-        } else if (event->level == LogEvent::INFO) {
+        } else if (event->level == LogEvent::RBM_INFO) {
            LOG_MSG(event->message, mongo::logger::LogSeverity::Info());
-        } else if (event->level == LogEvent::DEBUG) {
+        } else if (event->level == LogEvent::RBM_DEBUG) {
            LOG_MSG(event->message, mongo::logger::LogSeverity::Log());
        }
    }

    void App::handle(ListenSshConnectionResponse *event) {
        if (event->isError()) {
-            _bus->publish(new ConnectionFailedEvent(this, event->error().errorMessage()));
+            _bus->publish(new ConnectionFailedEvent(this, event->serverHandle, event->connectionType, event->error().errorMessage(),
+                ConnectionFailedEvent::SshChannel));
            return;
        }

        LOG_MSG(QString("SSH tunnel closed."), mongo::logger::LogSeverity::Error());
    }
+
+    void App::fireConnectionFailedEvent(int serverHandle, ConnectionType type, std::string errormsg,
+                                        ConnectionFailedEvent::Reason reason) {
+        _bus->publish(new ConnectionFailedEvent(this, serverHandle, type, errormsg, reason));
+    }
+
+    bool App::askSslPassphrasePromptDialog(ConnectionSettings *connSettings) const
+    {
+        auto sslSettings = connSettings->sslSettings();
+        bool ok = false;
+
+        std::stringstream s;
+        s << "In order to continue, please provide the passphrase";
+        s << "." << std::endl << std::endl;
+
+        s << "Server: " << connSettings->serverHost() << ":" << connSettings->serverPort() << std::endl;
+        s << "PEM file: " << sslSettings->pemKeyFile() << std::endl;
+
+        s << std::endl << "Enter your PEM key passphrase (will never be stored):";
+
+        QString userInput = QInputDialog::getText(NULL, tr("SSL Authentication"),
+            QtUtils::toQString(s.str()),
+            QLineEdit::Password, "", &ok);
+
+        if (!ok)
+        {
+            return false;
+        }
+
+        sslSettings->setPemPassPhrase(QtUtils::toStdString(userInput));
+        return ok;
+    }
+
 }
@@ -47,8 +47,9 @@ namespace Robomongo
         * @brief Creates and opens new server connection.
         * @param connection: ConnectionSettings, that will be owned by MongoServer.
         * @param visible: should this server be visible in UI (explorer) or not.
+         * @return Succeeded or not
         */
-        MongoServer *openServer(ConnectionSettings *connection, bool visible);
+        bool openServer(ConnectionSettings *connection, ConnectionType type);

        /**
         * @brief Closes MongoServer connection and frees all resources, owned
@@ -59,18 +60,22 @@ namespace Robomongo
        /**
         * @brief Open new shell based on specified collection
         */
-        MongoShell *openShell(MongoCollection *collection,const QString &filePathToSave=QString());
+        void openShell(MongoCollection *collection, const QString &filePathToSave = QString());

-        MongoShell *openShell(MongoServer *server, const QString &script, const std::string &dbName = std::string(),
+        void openShell(MongoServer *server, const QString &script, const std::string &dbName = std::string(),
                              bool execute = true, const QString &shellName = QString(),
                              const CursorPosition &cursorPosition = CursorPosition(), const QString &file = QString());

-        MongoShell *openShell(MongoDatabase *database, const QString &script,
+        void openShell(MongoDatabase *database, const QString &script,
                              bool execute = true, const QString &shellName = QString(),
                              const CursorPosition &cursorPosition = CursorPosition(), const QString &filePathToSave = QString());

-        MongoShell *openShell(ConnectionSettings *connection, const ScriptInfo &scriptInfo);
-        MongoServersContainerType getServers() const {return _servers; };
+        /**
+        * @brief Open new shell using explorer's MongoServer (ExplorerServerTreeItem's _server)
+        */
+        void openShell(MongoServer* server, ConnectionSettings* connSettings, const ScriptInfo &scriptInfo);
+
+        MongoServersContainerType getServers() const { return _servers; };

        /**
         * @brief Closes MongoShell and frees all resources, owned by specified MongoShell.
@@ -78,13 +83,25 @@ namespace Robomongo
         */
        void closeShell(MongoShell *shell);

+        void fireConnectionFailedEvent(int serverHandle, ConnectionType type, std::string errormsg, ConnectionFailedEvent::Reason reason);
+
+        int getLastServerHandle() const { return _lastServerHandle; };
+
    public Q_SLOTS:
        void handle(EstablishSshConnectionResponse *event);
        void handle(ListenSshConnectionResponse *event);
        void handle(LogEvent *event);

    private:
-        MongoServer* continueOpenServer(ConnectionSettings *connection, bool visible, int localport = 0);
+        MongoServer *openServerInternal(ConnectionSettings* connSettings, ConnectionType type);
+        MongoServer *continueOpenServer(int serverHandle, ConnectionSettings* connSettings, ConnectionType type, int localport = 0);
+
+        /**
+        * @brief Create prompt dialog to enter SSL PEM key passphrase and save passphrase into SSL settings
+        * @param connection Pointer to active connection settings
+        * @return true on success, false otherwise
+        */
+        bool askSslPassphrasePromptDialog(ConnectionSettings *connSettings) const;

        /**
         * MongoServers, owned by this App.
@@ -97,5 +114,9 @@ namespace Robomongo
        MongoShellsContainerType _shells;

        EventBus *const _bus;
+
+        // Increase monotonically when new MongoServer is created
+        // Never decreases.
+        int _lastServerHandle;
    };
 }
@@ -0,0 +1,23 @@
+#pragma once
+
+namespace Robomongo
+{
+    struct AggrInfo
+    {
+        AggrInfo() {}
+
+        AggrInfo(const std::string& collectionName, int skip, int batchSize, 
+                 mongo::BSONObj const& pipeline, mongo::BSONObj const& options, int resultIndex) :
+            collectionName(collectionName), skip(skip), batchSize(batchSize), pipeline(pipeline), 
+            options(options), isValid(true), resultIndex(resultIndex)
+        {}
+
+        std::string collectionName = "";
+        int skip = 0;
+        int batchSize = 0;   
+        mongo::BSONObj pipeline;
+        mongo::BSONObj options;
+        bool isValid = false;
+        int resultIndex = -1;
+    };
+}
@@ -5,6 +5,8 @@
 #include "robomongo/core/mongodb/MongoWorker.h"
 #include "robomongo/core/AppRegistry.h"
 #include "robomongo/core/EventBus.h"
+#include "robomongo/core/utils/Logger.h"
+#include "robomongo/utils/common.h"

 namespace Robomongo
 {
@@ -15,6 +17,13 @@ namespace Robomongo
    R_REGISTER_EVENT(MongoDatabaseFunctionsLoadingEvent)
    R_REGISTER_EVENT(MongoDatabaseCollectionsLoadingEvent)

+    const std::string MongoDatabase::StorageEngineType::WIRED_TIGER = "wiredTiger";
+    const std::string MongoDatabase::StorageEngineType::MMAPV1      = "mmapv1";
+ 
+    const float MongoDatabase::DBVersion::MONGODB_2_6 = 2.6f;
+    const float MongoDatabase::DBVersion::MONGODB_3_0 = 3.0f;
+    const float MongoDatabase::DBVersion::MONGODB_3_2 = 3.2f;
+
    MongoDatabase::MongoDatabase(MongoServer *server, const std::string &name) :
        QObject(),
        _system(name == "admin" || name == "local"),
@@ -30,113 +39,148 @@ namespace Robomongo
    void MongoDatabase::loadCollections()
    {
        _bus->publish(new MongoDatabaseCollectionsLoadingEvent(this));
-        _bus->send(_server->client(), new LoadCollectionNamesRequest(this, _name));
+        _bus->send(_server->worker(), new LoadCollectionNamesRequest(this, _name));
    }

    void MongoDatabase::loadUsers()
    {
        _bus->publish(new MongoDatabaseUsersLoadingEvent(this));
-        _bus->send(_server->client(), new LoadUsersRequest(this, _name));
+        _bus->send(_server->worker(), new LoadUsersRequest(this, _name));
    }

    void MongoDatabase::loadFunctions()
    {
        _bus->publish(new MongoDatabaseFunctionsLoadingEvent(this));
-        _bus->send(_server->client(), new LoadFunctionsRequest(this, _name));
+        _bus->send(_server->worker(), new LoadFunctionsRequest(this, _name));
    }
-    void MongoDatabase::createCollection(const std::string &collection)
+
+    void MongoDatabase::createCollection(const std::string &collection, long long size, bool capped, int maxDocNum, const mongo::BSONObj& extraOptions)
    {
-        _bus->send(_server->client(), new CreateCollectionRequest(this, MongoNamespace(_name, collection)));
+        _bus->send(_server->worker(), 
+            new CreateCollectionRequest(this, MongoNamespace(_name, collection), extraOptions, size, capped, maxDocNum));
    }

    void MongoDatabase::dropCollection(const std::string &collection)
    {
-        _bus->send(_server->client(), new DropCollectionRequest(this, MongoNamespace(_name, collection)));
+        _bus->send(_server->worker(), new DropCollectionRequest(this, MongoNamespace(_name, collection)));
    }

    void MongoDatabase::renameCollection(const std::string &collection, const std::string &newCollection)
    {
-        _bus->send(_server->client(), new RenameCollectionRequest(this, MongoNamespace(_name, collection), newCollection));
+        _bus->send(_server->worker(), new RenameCollectionRequest(this, MongoNamespace(_name, collection), 
+                                                                  newCollection));
    }

    void MongoDatabase::duplicateCollection(const std::string &collection, const std::string &newCollection)
    {
-        _bus->send(_server->client(), new DuplicateCollectionRequest(this, MongoNamespace(_name, collection), newCollection));
+        _bus->send(_server->worker(), new DuplicateCollectionRequest(this, MongoNamespace(_name, collection), newCollection));
    }

    void MongoDatabase::copyCollection(MongoServer *server, const std::string &sourceDatabase, const std::string &collection)
    {
-        _bus->send(_server->client(), new CopyCollectionToDiffServerRequest(this, server->client(), sourceDatabase, collection, _name));
+        _bus->send(_server->worker(), new CopyCollectionToDiffServerRequest(this, server->worker(), sourceDatabase, collection, _name));
    }

-    void MongoDatabase::createUser(const MongoUser &user, bool overwrite)
+    void MongoDatabase::createUser(const MongoUser &user)
    {
-        _bus->send(_server->client(), new CreateUserRequest(this, _name, user, overwrite));
+        _bus->send(_server->worker(), new CreateUserRequest(this, _name, user));
    }

-    void MongoDatabase::dropUser(const mongo::OID &id)
+    void MongoDatabase::dropUser(std::string const& userName)
    {
-        _bus->send(_server->client(), new DropUserRequest(this, _name, id));
+        _bus->send(_server->worker(), new DropUserRequest(this, _name, userName));
    }

    void MongoDatabase::createFunction(const MongoFunction &fun)
    {
-        _bus->send(_server->client(), new CreateFunctionRequest(this, _name, fun));
+        _bus->send(_server->worker(), new CreateFunctionRequest(this, _name, _server->version(), fun));
    }

    void MongoDatabase::updateFunction(const std::string &name, const MongoFunction &fun)
    {
-        _bus->send(_server->client(), new CreateFunctionRequest(this, _name, fun, name));
+        _bus->send(_server->worker(), new CreateFunctionRequest(this, _name, _server->version(), fun, name));
    }

    void MongoDatabase::dropFunction(const std::string &name)
    {
-        _bus->send(_server->client(), new DropFunctionRequest(this, _name, name));
+        _bus->send(_server->worker(), new DropFunctionRequest(this, _name, _server->version(), name));
    }

-    void MongoDatabase::handle(LoadCollectionNamesResponse *loaded)
+    void MongoDatabase::handle(LoadCollectionNamesResponse *event)
    {
-        if (loaded->isError()) {
-            _bus->publish(new MongoDatabaseCollectionListLoadedEvent(this, loaded->error()));
+        if (event->isError()) {
+            if (_server->connectionRecord()->isReplicaSet()) // replica set
+                handleIfReplicaSetUnreachable(event);            
+            else  // single server
+                _bus->publish(new MongoDatabaseCollectionListLoadedEvent(this, event->error()));            
+
+            genericEventErrorHandler(event, "Failed to refresh 'Collections'.", _bus, this);
            return;
        }

        clearCollections();
-        const std::vector<MongoCollectionInfo> &colectionsInfos = loaded->collectionInfos();
-        for (std::vector<MongoCollectionInfo>::const_iterator it = colectionsInfos.begin(); it != colectionsInfos.end(); ++it) {
-            const MongoCollectionInfo &info = *it;
-            MongoCollection *collection = new MongoCollection(this, info);
-            addCollection(collection);
-        }
+
+        for (auto const& collectionInfo : event->collectionInfos())
+            addCollection(new MongoCollection(this, collectionInfo));

        _bus->publish(new MongoDatabaseCollectionListLoadedEvent(this, _collections));
+        LOG_MSG("'Collections' refreshed.", mongo::logger::LogSeverity::Info());
+    }
+
+    void MongoDatabase::handle(CreateFunctionResponse *event)
+    {
+        if (event->isError()) {
+            handleIfReplicaSetUnreachable(event);
+            genericEventErrorHandler(event, "Failed to create function \'" + event->functionName + "\'.", _bus, this);
+        }
+        else {
+            loadFunctions();
+            LOG_MSG("Function \'" + event->functionName + "\' created.", mongo::logger::LogSeverity::Info());
+        }
    }

    void MongoDatabase::handle(CreateUserResponse *event)
    {
-        if (event->isError())
-            return;
-
+        if (event->isError()) {
+            handleIfReplicaSetUnreachable(event);
+            genericEventErrorHandler(event, "Failed to create user \'" + event->userName + "\'.", _bus, this);
+        }
+        else {
+            loadUsers();
+            LOG_MSG("User \'" + event->userName + "\' created.", mongo::logger::LogSeverity::Info());
+        }
    }

    void MongoDatabase::handle(LoadUsersResponse *event)
    {
        if (event->isError()) {
            _bus->publish(new MongoDatabaseUsersLoadedEvent(this, event->error()));
+
+            if (_server->connectionRecord()->isReplicaSet()) // replica set
+                handleIfReplicaSetUnreachable(event);           
+
+            genericEventErrorHandler(event, "Failed to refresh 'Users'.", _bus, this);
            return;
        }

        _bus->publish(new MongoDatabaseUsersLoadedEvent(this, this, event->users()));
+        LOG_MSG("'Users' refreshed.", mongo::logger::LogSeverity::Info());
    }

    void MongoDatabase::handle(LoadFunctionsResponse *event)
    {
        if (event->isError()) {
            _bus->publish(new MongoDatabaseFunctionsLoadedEvent(this, event->error()));
+
+            if (_server->connectionRecord()->isReplicaSet()) // replica set
+                handleIfReplicaSetUnreachable(event);           
+
+            genericEventErrorHandler(event, "Failed to refresh 'Functions'.", _bus, this);
            return;
        }

        _bus->publish(new MongoDatabaseFunctionsLoadedEvent(this, this, event->functions()));
+        LOG_MSG("'Functions' refreshed.", mongo::logger::LogSeverity::Info());
    }

    void MongoDatabase::clearCollections()
@@ -149,4 +193,92 @@ namespace Robomongo
    {
        _collections.push_back(collection);
    }
+
+    void MongoDatabase::handle(CreateCollectionResponse *event) 
+    {
+        if (event->isError()) {
+            handleIfReplicaSetUnreachable(event);
+            genericEventErrorHandler(event, "Failed to create collection \'" + event->collection + "\'.", _bus, this);
+        }
+        else {
+            loadCollections();
+            LOG_MSG("Collection \'" + event->collection + "\' created.", mongo::logger::LogSeverity::Info());
+        }
+    }
+
+    void MongoDatabase::handle(DropCollectionResponse *event) 
+    {
+        if (event->isError()) {
+            handleIfReplicaSetUnreachable(event);
+            genericEventErrorHandler(event, "Failed to drop collection \'" + event->collection + "\'.", _bus, this);
+        }
+        else {
+            loadCollections();
+            LOG_MSG("Collection \'" + event->collection + "\' dropped", mongo::logger::LogSeverity::Info());
+        }
+    }
+
+    
+    void MongoDatabase::handle(DropFunctionResponse *event)
+    {
+        if (event->isError()) {
+            handleIfReplicaSetUnreachable(event);
+            genericEventErrorHandler(event, "Failed to remove function \'" + event->functionName + "\'.", _bus, this);
+        }
+        else {
+            loadFunctions();
+            LOG_MSG("Function \'" + event->functionName + "\' removed", mongo::logger::LogSeverity::Info());
+        }
+    }
+
+    void MongoDatabase::handle(DropUserResponse *event)
+    {
+        if (event->isError()) {
+            handleIfReplicaSetUnreachable(event);
+            genericEventErrorHandler(event, "Failed to drop user \'" + event->username + "\'.", _bus, this);
+        }
+        else {
+            loadUsers();
+            LOG_MSG("User \'" + event->username + "\' dropped", mongo::logger::LogSeverity::Info());
+        }
+    }
+
+    void MongoDatabase::handle(RenameCollectionResponse *event)
+    {
+        if (event->isError()) {
+            handleIfReplicaSetUnreachable(event);
+            genericEventErrorHandler(event, "Failed to rename collection.", _bus, this);
+        }
+        else {
+            loadCollections();
+            LOG_MSG("Collection \'" + event->oldCollection + "\' renamed to \'" + 
+                    event->newCollection +"\'." , mongo::logger::LogSeverity::Info());
+        }
+    }
+
+    void MongoDatabase::handle(DuplicateCollectionResponse *event)
+    {
+        if (event->isError()) {
+            handleIfReplicaSetUnreachable(event);
+            genericEventErrorHandler(event, "Failed to duplicate collection \'" + event->sourceCollection + "\'.", 
+                                   _bus, this);
+        }
+        else {
+            loadCollections();
+            LOG_MSG("Collection \'" + event->sourceCollection + "\' duplicated as \'" +
+                    event->duplicateCollection + "\'.", mongo::logger::LogSeverity::Info());
+        }
+    }
+
+    void MongoDatabase::handleIfReplicaSetUnreachable(Event *event)
+    {
+        if (!_server->connectionRecord()->isReplicaSet())
+            return;
+
+        if (EventError::SetPrimaryUnreachable == event->error().errorCode()) {
+            auto refreshEvent = ReplicaSetRefreshed(this, event->error(), event->error().replicaSetInfo());
+            _server->handle(&refreshEvent);
+        }
+    }
+
 }
@@ -18,6 +18,25 @@ namespace Robomongo
        Q_OBJECT

    public:
+        /**
+        * @brief Database storage engine type
+        */
+        struct StorageEngineType
+        {
+            static const std::string WIRED_TIGER;
+            static const std::string MMAPV1;
+        };
+
+        /**
+        * @brief MongoDB version
+        */
+        struct DBVersion 
+        {
+            static const float MONGODB_2_6;
+            static const float MONGODB_3_0;
+            static const float MONGODB_3_2;
+        };
+
        /**
         * @brief MongoDatabase
         * @param server: pointer to parent MongoServer
@@ -37,14 +56,14 @@ namespace Robomongo

        void loadFunctions();

-        void createCollection(const std::string &collection);
+        void createCollection(const std::string &collection, long long size, bool capped, int maxDocNum, const mongo::BSONObj& extraOptions);
        void dropCollection(const std::string &collection);
        void renameCollection(const std::string &collection, const std::string &newCollection);
        void duplicateCollection(const std::string &collection, const std::string &newCollection);
        void copyCollection(MongoServer *server, const std::string &sourceDatabase, const std::string &collection);

-        void createUser(const MongoUser &user, bool overwrite);
-        void dropUser(const mongo::OID &id);
+        void createUser(const MongoUser &user);
+        void dropUser(std::string const& userName);

        void createFunction(const MongoFunction &fun);
        void updateFunction(const std::string &name, const MongoFunction &fun);
@@ -64,11 +83,19 @@ namespace Robomongo
        void handle(LoadCollectionNamesResponse *event);
        void handle(LoadUsersResponse *event);
        void handle(LoadFunctionsResponse *event);
+        void handle(CreateFunctionResponse *event);
        void handle(CreateUserResponse *event);
+        void handle(CreateCollectionResponse *event);
+        void handle(DropCollectionResponse *event);
+        void handle(DropFunctionResponse *event);
+        void handle(DropUserResponse *event);
+        void handle(RenameCollectionResponse *event);
+        void handle(DuplicateCollectionResponse *event);

    private:
        void clearCollections();
        void addCollection(MongoCollection *collection);
+        void handleIfReplicaSetUnreachable(Event *event);

    private:
        MongoServer *_server;
@@ -38,7 +38,7 @@ namespace Robomongo
    std::vector<MongoDocumentPtr> MongoDocument::fromBsonObj(const std::vector<mongo::BSONObj> &bsonObjs)
    {
        std::vector<MongoDocumentPtr> list;
-        for (std::vector<mongo::BSONObj>::const_iterator it=bsonObjs.begin(); it!=bsonObjs.end(); ++it) {
+        for (std::vector<mongo::BSONObj>::const_iterator it = bsonObjs.begin(); it != bsonObjs.end(); ++it) {
            list.push_back(fromBsonObj(*it));
        }

@@ -6,7 +6,7 @@ namespace Robomongo
 {
    MongoFunction::MongoFunction(const mongo::BSONObj &obj)
    {
-        _name = BsonUtils::getField<mongo::String>(obj,"_id");
+        _name = BsonUtils::getField<mongo::String>(obj, "_id");
        _code = obj.getField("value")._asCode();
    }

@@ -9,8 +9,8 @@ namespace Robomongo
        std::string prepareServerAddress(const std::string &address)
        {
            size_t pos = address.find_first_of("{");
-            if (pos!=std::string::npos){
-                return address.substr(0,pos);
+            if (pos != std::string::npos) {
+                return address.substr(0, pos);
            }       
            return address;
        }
@@ -20,7 +20,7 @@ namespace Robomongo

    CollectionInfo::CollectionInfo(const std::string &server, const std::string &database, const std::string &collection)
        :_serverAddress(server),
-        _ns(database,collection)
+        _ns(database, collection)
    {}

    bool CollectionInfo::isValid() const
@@ -4,55 +4,86 @@
 #include "robomongo/core/settings/ConnectionSettings.h"
 #include "robomongo/core/settings/SshSettings.h"
 #include "robomongo/core/settings/SettingsManager.h"
+#include "robomongo/core/settings/ReplicaSetSettings.h"
 #include "robomongo/core/mongodb/MongoWorker.h"
 #include "robomongo/core/mongodb/SshTunnelWorker.h"
 #include "robomongo/core/AppRegistry.h"
+#include "robomongo/core/domain/App.h"
 #include "robomongo/core/EventBus.h"
+#include "robomongo/core/events/MongoEventsInfo.h"
+#include "robomongo/core/utils/Logger.h"
 #include "robomongo/core/utils/QtUtils.h"
+#include "robomongo/gui/MainWindow.h"
+#include "robomongo/utils/common.h"
+#include "robomongo/utils/StringOperations.h"
+
+#include <QApplication>

 namespace Robomongo {
    R_REGISTER_EVENT(MongoServerLoadingDatabasesEvent)

-    MongoServer::MongoServer(ConnectionSettings *settings, bool visible) : QObject(),
+    MongoServer::MongoServer(int handle, ConnectionSettings *settings, ConnectionType connectionType) 
+        : QObject(),
        _version(0.0f),
-        _visible(visible),
-        _client(NULL),
+        _connectionType(connectionType),
+        _worker(nullptr),
        _isConnected(false),
-        _settings(settings),
-        _bus(AppRegistry::instance().bus()) { }
+        _connSettings(settings),
+        _handle(handle),
+        _bus(AppRegistry::instance().bus()),
+        _app(AppRegistry::instance().app()),
+        _replicaSetInfo(nullptr)
+    {}

    bool MongoServer::isConnected() const {
        return _isConnected;
    }

    ConnectionSettings *MongoServer::connectionRecord() const {
-        return _settings;
+        return _connSettings.get();
    }

    MongoServer::~MongoServer() {
        clearDatabases();

-        if (_client != NULL) {
-            _client->stopAndDelete();
+        if (_worker) {
+            _worker->stopAndDelete();
        }

-        // MongoWorker "_client" does not deleted here, because it is now owned by
+        // MongoWorker "_worker" is not deleted here, because it is now owned by
        // another thread (call to moveToThread() made in MongoWorker constructor).
        // It will be deleted by this thread by means of "deleteLater()", which
        // is also specified in MongoWorker constructor.
-
-        delete _settings;
    }

-    /**
-     * @brief Try to connect to MongoDB server.
-     * @throws MongoException, if fails
-     */
-    void MongoServer::tryConnect() {
-        _bus->send(_client, new EstablishConnectionRequest(this));
+    void MongoServer::tryConnect() 
+    {
+        _bus->send(_worker, new EstablishConnectionRequest(this, _connectionType, _connSettings->uuid().toStdString()));
    }

-    QStringList MongoServer::getDatabasesNames() const {
+    void MongoServer::tryRefresh() 
+    {
+        _bus->send(_worker, new EstablishConnectionRequest(this, ConnectionRefresh, _connSettings->uuid().toStdString()));
+    }
+
+    void MongoServer::tryRefreshReplicaSetConnection()
+    {
+        _bus->send(_worker, new EstablishConnectionRequest(this, ConnectionRefresh, _connSettings->uuid().toStdString()));
+    }
+    
+    void MongoServer::tryRefreshReplicaSetFolder(bool expanded, bool showLoading /*= true*/)
+    {
+        if (!_connSettings->isReplicaSet())
+            return;
+
+        if (showLoading)
+            _bus->publish(new ReplicaSetFolderLoading(this));
+
+        _bus->send(_worker, new RefreshReplicaSetFolderRequest(this, expanded));
+    }
+
+    QStringList MongoServer::getDatabasesNames() const 
+    {
        QStringList result;
        for (QList<MongoDatabase *>::const_iterator it = _databases.begin(); it != _databases.end(); ++it) {
            MongoDatabase *datab = *it;
@@ -61,11 +92,17 @@ namespace Robomongo {
        return result;
    }

-    void MongoServer::createDatabase(const std::string &dbName) {
-        _bus->send(_client,new CreateDatabaseRequest(this, dbName));
+    void MongoServer::addDatabase(MongoDatabase *database) {
+        _databases.append(database);
    }

-    MongoDatabase *MongoServer::findDatabaseByName(const std::string &dbName) const {
+    void MongoServer::createDatabase(const std::string &dbName) 
+    {
+        _bus->send(_worker, new CreateDatabaseRequest(this, dbName));
+    }
+
+    MongoDatabase *MongoServer::findDatabaseByName(const std::string &dbName) const 
+    {
        for (QList<MongoDatabase *>::const_iterator it = _databases.begin(); it != _databases.end(); ++it) {
            MongoDatabase *datab = *it;
            if (datab->name() == dbName) {
@@ -76,7 +113,7 @@ namespace Robomongo {
    }

    void MongoServer::dropDatabase(const std::string &dbName) {
-        _bus->send(_client,new DropDatabaseRequest(this, dbName));
+        _bus->send(_worker, new DropDatabaseRequest(this, dbName));
    }

    void MongoServer::insertDocuments(const std::vector<mongo::BSONObj> &objCont,
@@ -87,94 +124,381 @@ namespace Robomongo {
    }

    void MongoServer::insertDocument(const mongo::BSONObj &obj, const MongoNamespace &ns) {
-        _bus->send(_client,new InsertDocumentRequest(this, obj, ns));
+        _bus->send(_worker, new InsertDocumentRequest(this, obj, ns));
    }

    void MongoServer::saveDocuments(const std::vector<mongo::BSONObj> &objCont, const MongoNamespace &ns) {
        for (std::vector<mongo::BSONObj>::const_iterator it = objCont.begin(); it != objCont.end(); it++) {
-            saveDocument(*it,ns);
+            saveDocument(*it, ns);
        }
    }

    void MongoServer::saveDocument(const mongo::BSONObj &obj, const MongoNamespace &ns) {
-        _bus->send(_client, new InsertDocumentRequest(this, obj, ns, true));
+        _bus->send(_worker, new InsertDocumentRequest(this, obj, ns, true));
    }

-    void MongoServer::removeDocuments(mongo::Query query, const MongoNamespace &ns, bool justOne) {
-        _bus->send(_client, new RemoveDocumentRequest(this, query, ns, justOne));
+    void MongoServer::removeDocuments(mongo::Query query, const MongoNamespace &ns, 
+                                      RemoveDocumentCount removeCount, int index) 
+    {
+        _bus->send(_worker, new RemoveDocumentRequest(this, query, ns, removeCount, index));
    }

-    void MongoServer::loadDatabases() {
+    void MongoServer::loadDatabases() 
+    {
        _bus->publish(new MongoServerLoadingDatabasesEvent(this));
-        _bus->send(_client, new LoadDatabaseNamesRequest(this));
+        if (_connSettings->isReplicaSet()) {
+            tryRefreshReplicaSetConnection();
+        }
+        else {  // single server
+            _bus->send(_worker, new LoadDatabaseNamesRequest(this));
+        }
    }

-    void MongoServer::clearDatabases() {
+    void MongoServer::clearDatabases() 
+    {
        qDeleteAll(_databases);
        _databases.clear();
    }

-    void MongoServer::addDatabase(MongoDatabase *database) {
-        _databases.append(database);
-    }
+    void MongoServer::handle(EstablishConnectionResponse *event) 
+    {
+        _connectionType = event->connectionType;

-    void MongoServer::handle(EstablishConnectionResponse *event) {
+        // In any case, replica set info must be updated, there might be reachable secondary(ies).
+        // Also cached set name must be updated or cleared for failed connections.
+        updateReplicaSetSettings(event);
+
+        // --- Connection Failed
        if (event->isError()) {
-            _isConnected = false;
-
-            std::stringstream ss;
-            ss << "Cannot connect to the MongoDB at " << connectionRecord()->getFullAddress()
-               << ".\n\nError:\n" << event->error().errorMessage();
-
-            _bus->publish(new ConnectionFailedEvent(this, ss.str()));
+            handleConnectionFailure(event);
            return;
        }

-        const ConnectionInfo &info = event->info();
+        // --- Connections Successful
+        // Save various information after successful connection
+        const ConnectionInfo &info = event->info;
        _version = info._version;
+        _storageEngineType = info._storageEngineType;
        _isConnected = true;

-        // Do nothing if this is not "visible" connection
-        if (!_visible) {
-            return;
+        // ConnectionRefresh is used just to update connection view (_version, _storageEngineType, _repPrimary etc..)
+        // So we return here after updating(refreshing) information related to connection view.
+        if (ConnectionRefresh == event->connectionType) {
+            if (_connSettings->isReplicaSet()) {
+                // If it is replica set connection, do not return yet.
+                LOG_MSG("Replica set refreshed. [" + _connSettings->connectionName() + ']', 
+                         mongo::logger::LogSeverity::Info());
+            }
+            else {  // single server
+                LOG_MSG("Server refreshed.", mongo::logger::LogSeverity::Info());
+                return;
+            }
        }

-        _bus->publish(new ConnectionEstablishedEvent(this));
-        clearDatabases();
-        for(std::vector<std::string>::const_iterator it = info._databases.begin(); it != info._databases.end(); ++it) {
-            const std::string &name = *it;
-            MongoDatabase *db  = new MongoDatabase(this, name);
-            addDatabase(db);
+        // Only for single servers
+        if (!_connSettings->isReplicaSet()) {
+            _bus->publish(new ConnectionEstablishedEvent(this, _connectionType, info));
+            // Do nothing if this is not a "primary" connection
+            if (ConnectionPrimary != _connectionType)
+                return;
        }
+
+        if (ConnectionPrimary == _connectionType)
+            LOG_MSG("Establish connection successful. Connection: " + _connSettings->connectionName(),
+                     mongo::logger::LogSeverity::Info());
+
+        clearDatabases();
+        for (auto const& dbname : info._databases) {
+            MongoDatabase *db  = new MongoDatabase(this, dbname);
+            addDatabase(db);    // todo: serverClones for replica sets should not do this
+        }
+
+        if (_connSettings->isReplicaSet()) {
+            _bus->publish(new ConnectionEstablishedEvent(this, event->connectionType, info));
+            // In order to do first connection much faster, time consuming refresh 
+            // "repSetMonitor->startOrContinueRefresh(). refreshAll()" is being requested after 
+            // successful connection.
+            if (ConnectionPrimary == event->connectionType)
+                _bus->send(_worker, new RefreshReplicaSetFolderRequest(this, false));
+        }
+
+        // Save connected db version if not saved before and if this is primary connection.
+        QString const versionStr = QString::fromStdString(info._dbVersionStr);
+        auto const& settingsManager = AppRegistry::instance().settingsManager();
+        if (ConnectionPrimary == _connectionType &&
+            !settingsManager->dbVersionsConnected().contains(versionStr)) {
+            settingsManager->addDbVersionConnected(versionStr);
+            settingsManager->save();
+        }
+
    }

-    void MongoServer::handle(LoadDatabaseNamesResponse *event) {
+    void MongoServer::handle(RefreshReplicaSetFolderResponse *event)
+    {
+        handleReplicaSetRefreshEvents(event->isError(), event->error(), event->replicaSet, event->expanded);
+    }
+
+    void MongoServer::handle(LoadDatabaseNamesResponse *event) 
+    {
        if (event->isError()) {
            _bus->publish(new DatabaseListLoadedEvent(this, event->error()));
            return;
        }

        clearDatabases();
-        for(std::vector<std::string>::iterator it = event->databaseNames.begin(); it != event->databaseNames.end(); ++it) {
-            const std::string &name = *it;
-            MongoDatabase *db  = new MongoDatabase(this, name);
+
+        for (auto const& dbname : event->databaseNames) {
+            MongoDatabase *db  = new MongoDatabase(this, dbname);
            addDatabase(db);
        }

        _bus->publish(new DatabaseListLoadedEvent(this, _databases));
+        LOG_MSG("Database list refreshed. Connection: " + _connSettings->connectionName(), 
+                 mongo::logger::LogSeverity::Info());
    }

-    void MongoServer::handle(InsertDocumentResponse *event) {
-        _bus->publish(new InsertDocumentResponse(event->sender(), event->error()));
+    void MongoServer::handle(InsertDocumentResponse *event) 
+    {
+        if (event->isError()) {
+            hideProgressBar();
+            if (_connSettings->isReplicaSet()) {
+                if (ConnectionPrimary == _connectionType) { // Insert document from explorer context menu
+                    if (EventError::SetPrimaryUnreachable == event->error().errorCode()) {
+                        auto refreshEvent = ReplicaSetRefreshed(this, event->error(), event->error().replicaSetInfo());
+                        handle(&refreshEvent);
+                    }
+                }
+                else {  // Insert document from tab results window (Notifier, OutputWindow widget)
+                    _bus->publish(new InsertDocumentResponse(this, event->error()));
+                }
+            }
+            genericEventErrorHandler(event, "Failed to insert document.", _bus, this);
+        }
+        else {
+            _bus->publish(new InsertDocumentResponse(this, event->error()));
+            LOG_MSG("Document inserted.", mongo::logger::LogSeverity::Info());
+        }
    }

-    void MongoServer::handle(RemoveDocumentResponse *event) {
-        _bus->publish(new RemoveDocumentResponse(event->sender(), event->error()));
+    void MongoServer::handle(RemoveDocumentResponse *event) 
+    {        
+        if (event->removeCount == RemoveDocumentCount::MULTI && event->index > 0)
+            return;
+
+        std::string subStr;
+        switch (event->removeCount) {
+            case RemoveDocumentCount::ONE:    subStr = "document."; break;
+            case RemoveDocumentCount::MULTI:  subStr = "documents."; break;
+            case RemoveDocumentCount::ALL:    subStr = "all documents."; break;
+            default:                          subStr = "(logic error)."; break;
+        }
+
+        if (event->isError()) {
+            hideProgressBar();
+            if (_connSettings->isReplicaSet() &&
+                EventError::SetPrimaryUnreachable == event->error().errorCode()) {
+                auto refreshEvent = ReplicaSetRefreshed(this, event->error(), event->error().replicaSetInfo());
+                handle(&refreshEvent);
+            }
+            genericEventErrorHandler(event, "Failed to remove " + subStr, _bus, this);
+        }
+        else {  // success
+            _bus->publish(new RemoveDocumentResponse(this, event->error(), event->removeCount, event->index));
+            LOG_MSG("Removed " + subStr, mongo::logger::LogSeverity::Info());
+        }
    }

-    void MongoServer::runWorkerThread() {
-        _client = new MongoWorker(_settings->clone(),
-            AppRegistry::instance().settingsManager()->loadMongoRcJs(),
-            AppRegistry::instance().settingsManager()->batchSize());
+    void MongoServer::runWorkerThread() 
+    {
+        _worker = new MongoWorker(_connSettings->clone(),
+                                  AppRegistry::instance().settingsManager()->loadMongoRcJs(),
+                                  AppRegistry::instance().settingsManager()->batchSize(),
+                                  AppRegistry::instance().settingsManager()->mongoTimeoutSec(),
+                                  AppRegistry::instance().settingsManager()->shellTimeoutSec());
    }
-}
+
+    void MongoServer::handle(CreateDatabaseResponse *event) 
+    {
+        if (event->isError()) {
+            if (_connSettings->isReplicaSet() &&
+                EventError::SetPrimaryUnreachable == event->error().errorCode()) {
+                auto refreshEvent = ReplicaSetRefreshed(this, event->error(), event->error().replicaSetInfo());
+                handle(&refreshEvent);
+            }
+            genericEventErrorHandler(event, "Failed to create database \'" + event->database + "\'.", _bus, this);
+        }
+        else {
+            loadDatabases();
+            LOG_MSG("Database \'" + event->database + "\' created.", mongo::logger::LogSeverity::Info());
+        }
+    }
+
+    void MongoServer::handle(DropDatabaseResponse *event) 
+    {
+        if (event->isError()) {
+            if (_connSettings->isReplicaSet() &&
+                EventError::SetPrimaryUnreachable == event->error().errorCode()) {
+                auto refreshEvent = ReplicaSetRefreshed(this, event->error(), event->error().replicaSetInfo());
+                handle(&refreshEvent);
+            }
+            genericEventErrorHandler(event, "Failed to drop database \'" + event->database + "\'.", _bus, this);
+        }
+        else {
+            loadDatabases();
+            LOG_MSG("Database \'" + event->database + "\' dropped.", mongo::logger::LogSeverity::Info());
+        }
+    }
+
+    void MongoServer::handle(ReplicaSetRefreshed *event) 
+    {
+        handleReplicaSetRefreshEvents(event->isError(), event->error(), event->replicaSet, false);
+    }
+
+    void MongoServer::changeWorkerShellTimeout(int newTimeout)
+    {
+        _worker->changeTimeout(newTimeout);
+    }
+
+    void MongoServer::handleReplicaSetRefreshEvents(bool isError, EventError eventError, 
+                                                    ReplicaSet const& replicaSet, bool expanded)
+    {
+        if (isError) { // Primary is unreachable
+            _replicaSetInfo.reset(new ReplicaSet(replicaSet));
+            LOG_MSG("Replica set folder refreshed with error. " + eventError.errorMessage() +
+                    ". Connection: " + _connSettings->connectionName(), mongo::logger::LogSeverity::Error());
+            _bus->publish(new ReplicaSetFolderRefreshed(this, eventError, true));
+            return;
+        }
+
+        // Primary is reachable
+        // Update replica set settings and mongo server _replicaSetInfo 
+        _replicaSetInfo.reset(new ReplicaSet(replicaSet));
+        _connSettings->setServerHost(_replicaSetInfo->primary.host());
+        _connSettings->setServerPort(_replicaSetInfo->primary.port());
+        _connSettings->replicaSetSettings()->setCachedSetName(
+            _connSettings->replicaSetSettings()->setNameUserEntered().empty() ? _replicaSetInfo->setName : "");
+
+        LOG_MSG("Replica set folder refreshed. Connection: " + _connSettings->connectionName(),
+                 mongo::logger::LogSeverity::Info());
+        _bus->publish(new ReplicaSetFolderRefreshed(this, expanded));
+    }
+
+    void MongoServer::updateReplicaSetSettings(EstablishConnectionResponse* event)
+    {
+        if (!_connSettings->isReplicaSet())
+            return;
+
+        _replicaSetInfo.reset(new ReplicaSet(event->replicaSet));
+        _connSettings->setServerHost(_replicaSetInfo->primary.host());
+        _connSettings->setServerPort(_replicaSetInfo->primary.port());
+        _connSettings->replicaSetSettings()->setCachedSetName(
+            _connSettings->replicaSetSettings()->setNameUserEntered().empty() ? _replicaSetInfo->setName : "");
+
+        if (_connSettings->replicaSetSettings()->setNameUserEntered().empty()) {
+            // Cache replica set name for 2 times faster first connection 
+            if (ConnectionPrimary == _connectionType) {
+                ConnectionSettings* originalConnSettings = AppRegistry::instance().settingsManager()
+                    ->getConnectionSettingsByUuid(event->info._uuid);
+                if (originalConnSettings) {
+                    auto setName = event->isError() ? "" : _replicaSetInfo->setName;
+                    originalConnSettings->replicaSetSettings()->setCachedSetName(setName);
+                    AppRegistry::instance().settingsManager()->save();
+                    LOG_MSG("Replica set name cached as \"" + setName + "\".", mongo::logger::LogSeverity::Info());
+                }
+                else
+                    LOG_MSG("Failed to cache the replica set name.", mongo::logger::LogSeverity::Warning());
+            }
+        }
+        else { // User entered set name is not empty, clear cached set name just in case
+            ConnectionSettings* originalConnSettings = AppRegistry::instance().settingsManager()
+                ->getConnectionSettingsByUuid(event->info._uuid);
+            if (originalConnSettings) {
+                originalConnSettings->replicaSetSettings()->setCachedSetName("");
+                AppRegistry::instance().settingsManager()->save();
+                LOG_MSG("Replica set's cached set name cleared. Using user entered set name.", 
+                        mongo::logger::LogSeverity::Info());
+            }
+        }
+    }
+
+    void MongoServer::handleConnectionFailure(EstablishConnectionResponse* event)
+    {
+        _isConnected = false;
+
+        std::stringstream ss("Unknown error");
+        auto eventErrorReason = event->errorReason;
+
+        if (_connSettings->isReplicaSet())
+        {
+            ss.clear();
+            std::string server = "";
+            if (_connSettings->replicaSetSettings()->members().size() > 0)
+                server = "[" + _connSettings->replicaSetSettings()->members().front() + "]";
+
+            if (event->error().errorCode() == EventError::ErrorCode::ServerHasDifferentMembers) {
+                ss << "Cannot connect to replica set \"" << _connSettings->connectionName() << "\"" << server
+                   << ". \n\nA primary with different host name [" << event->replicaSet.primary << 
+                   "] found in server side. "
+                   "Please double check if same host names and ports are used as in server's replica set"
+                   " configuration. \nIf same set name is used for different replica sets, this configuration"
+                   " is supported only on different instances of Robomongo. "
+                   " Please open a new Robomongo instance for each replica set which has the same set name."
+                   "\n\nReason:\n" << event->error().errorMessage();
+            }
+            else {
+                ss << "Cannot connect to replica set \"" << _connSettings->connectionName() << "\"" << server
+                   << ". \nSet's primary is unreachable.\n\nReason:\n" << event->error().errorMessage();
+            }
+
+            _bus->publish(new ConnectionFailedEvent(this, _handle, event->connectionType, ss.str(),
+                ConnectionFailedEvent::MongoConnection));
+            _app->fireConnectionFailedEvent(_handle, event->connectionType, ss.str(),
+                ConnectionFailedEvent::MongoConnection);
+            LOG_MSG("Establish connection failed. " + event->error().errorMessage() + ". Connection: "
+                + _connSettings->connectionName(), mongo::logger::LogSeverity::Error());
+        }
+        else    // single server 
+        {
+            if (EstablishConnectionResponse::ErrorReason::MongoSslConnection == eventErrorReason)
+            {
+                auto reason = ConnectionFailedEvent::SslConnection;
+                ss.clear();
+                ss << "Cannot connect to the MongoDB at " << connectionRecord()->getFullAddress()
+                    << ".\n\nError:\n" << "SSL connection failure: " << event->error().errorMessage();
+                _app->fireConnectionFailedEvent(_handle, _connectionType, ss.str(), reason);
+            }
+            else
+            {
+                auto reason = (EstablishConnectionResponse::ErrorReason::MongoAuth == eventErrorReason) ?
+                    ConnectionFailedEvent::MongoAuth : ConnectionFailedEvent::MongoConnection;
+                ss.clear();
+                ss << "Cannot connect to the MongoDB at " << connectionRecord()->getFullAddress()
+                    << ".\n\nError:\n" << event->error().errorMessage();
+                _app->fireConnectionFailedEvent(_handle, _connectionType, ss.str(), reason);
+            }
+
+            // When connection cannot be established, we should cleanup this instance of MongoServer if it wasn't
+            // shown in UI (i.e. it is not a Secondary connection that is used for shells tab)
+            if (_connectionType == ConnectionPrimary || _connectionType == ConnectionTest) 
+            {
+                LOG_MSG("Establish connection failed. " + event->error().errorMessage() +
+                        ". Connection: " + _connSettings->connectionName(), 
+                        mongo::logger::LogSeverity::Error());
+                _app->closeServer(this);
+            }
+        }
+    }
+
+    void MongoServer::hideProgressBar() const
+    {
+        MainWindow* mainWindow = nullptr;
+        for (auto wid : QApplication::topLevelWidgets()) {
+            if ((mainWindow = qobject_cast<MainWindow*>(wid)))
+                break;
+        }
+
+        if(mainWindow)
+            mainWindow->hideQueryWidgetProgressBar();
+    }
+
+}   // namespace Robomongo
@@ -8,10 +8,16 @@ namespace Robomongo
 {
    class MongoWorker;
    class MongoDatabase;
-    class EstablishConnectionResponse;
+    class EventBus;
+    class App;
+
+    // Messages
+    struct EstablishConnectionResponse;
+    struct RefreshReplicaSetFolderResponse;
    class LoadDatabaseNamesResponse;
    class InsertDocumentResponse;
-    class EventBus;
+    struct CreateDatabaseResponse;
+    struct DropDatabaseResponse;

    /**
     * @brief MongoServer represents active connection to MongoDB server.
@@ -29,30 +35,60 @@ namespace Robomongo
         * @param visible
         * @param defaultDatabase
         */
-        MongoServer(ConnectionSettings *connectionRecord, bool visible);
+        MongoServer(int handle, ConnectionSettings *connectionRecord, ConnectionType connectionType);
        ~MongoServer();

        void runWorkerThread();

        /**
-         * @brief Try to connect to MongoDB server.
+         * @brief Try to connect to MongoDB single server or replica set.
         * @throws MongoException, if fails
         */
        void tryConnect();
-        bool isConnected()const;

+        /**
+        * @brief Try to re-connect to MongoDB server in order to refresh connection view.
+        *        Never shown in Explorer and can be used to refresh (via reconnecting) current connection view.
+        *        (i.e. db version, storage engine etc...)
+        * @throws MongoException, if fails
+        */
+        void tryRefresh();
+
+        /**
+        * @brief Try to re-connect to MongoDB replica set in order to refresh connection view.
+        *        It is used to refresh (via reconnecting) current connection view.
+        *        (i.e. db version, storage engine, current replica set primary, status of replica set etc...)
+        *        It will update Explorer widgets depending on replica set status (online if primary reachable and
+        *        offline otherwise)
+        */
+        void tryRefreshReplicaSetConnection();
+
+        /**
+        * @brief Try to re-connect to MongoDB replica set in order to refresh connection view.
+        *        It is used to refresh (via reconnecting) current connection view.
+        *        (i.e. db version, storage engine, current replica set primary, status of replica set etc...)
+        *        It will update only 'Replica Set' folder widgets depending on replica set status 
+        *       (online if primary reachable and offline otherwise)
+        */
+        void tryRefreshReplicaSetFolder(bool expanded, bool showLoading = true);
+
+        bool isConnected() const;
+
+        void addDatabase(MongoDatabase *database);
        void createDatabase(const std::string &dbName);
        void dropDatabase(const std::string &dbName);
        QStringList getDatabasesNames() const;
+        QList<MongoDatabase*> const& databases() const { return _databases; };
        MongoDatabase *findDatabaseByName(const std::string &dbName) const;

        void insertDocuments(const std::vector<mongo::BSONObj> &objCont, const MongoNamespace &ns);
        void insertDocument(const mongo::BSONObj &obj, const MongoNamespace &ns);
        void saveDocuments(const std::vector<mongo::BSONObj> &objCont, const MongoNamespace &ns);
        void saveDocument(const mongo::BSONObj &obj, const MongoNamespace &ns);
-        void removeDocuments(mongo::Query query, const MongoNamespace &ns, bool justOne = true);
+        void removeDocuments(mongo::Query query, const MongoNamespace &ns, RemoveDocumentCount removeCount, 
+                             int index = 0);
        float version() const{ return _version; }
-
+        const std::string& getStorageEngineType() const { return _storageEngineType; }

        /**
         * @brief Returns associated connection record
@@ -63,28 +99,44 @@ namespace Robomongo
         * @brief Loads databases of this server asynchronously.
         */
        void loadDatabases();
-        bool visible() const { return _visible; }
-        MongoWorker *const client() const { return _client; }
+        MongoWorker *const worker() const { return _worker; }
+
+        ReplicaSet* replicaSetInfo() const { return _replicaSetInfo.get(); }
+
+        void handle(ReplicaSetRefreshed *event);
+
+        void changeWorkerShellTimeout(int newTimeout);

    protected Q_SLOTS:
        void handle(EstablishConnectionResponse *event);
+        void handle(RefreshReplicaSetFolderResponse *event);
        void handle(LoadDatabaseNamesResponse *event);
        void handle(InsertDocumentResponse *event);
        void handle(RemoveDocumentResponse *event);
+        void handle(CreateDatabaseResponse *event);
+        void handle(DropDatabaseResponse *event);

-    private:
+    private:                 
        void clearDatabases();
-        void addDatabase(MongoDatabase *database);
+        void handleReplicaSetRefreshEvents(bool isError, EventError eventError, ReplicaSet const& replicaSet,
+                                           bool expanded);
+        void updateReplicaSetSettings(EstablishConnectionResponse* event);
+        void handleConnectionFailure(EstablishConnectionResponse* event);
+        void hideProgressBar() const;

-        MongoWorker* _client;
-        ConnectionSettings* _settings;
-        EventBus* _bus;
+        MongoWorker *_worker;
+        std::unique_ptr<ConnectionSettings> _connSettings;
+        EventBus *_bus;
+        App *_app;

        float _version;
-        bool _visible;
+        std::string _storageEngineType;
+        ConnectionType _connectionType;
        bool _isConnected;
+        int _handle;

        QList<MongoDatabase *> _databases;
+        std::unique_ptr<ReplicaSet> _replicaSetInfo;
    };

    class MongoServerLoadingDatabasesEvent : public Event
@@ -11,20 +11,20 @@
 #include "robomongo/core/settings/SettingsManager.h"

 namespace Robomongo
-{
-
-    MongoShell::MongoShell(MongoServer *server, const ScriptInfo &scriptInfo) :
+{  
+    MongoShell::MongoShell(MongoServer *server, ScriptInfo scriptInfo) :
        QObject(),
        _scriptInfo(scriptInfo),
-        _server(server)
+        _server(server)      
    {
    }

    void MongoShell::open(const std::string &script, const std::string &dbName)
    {
-        AppRegistry::instance().bus()->publish(new ScriptExecutingEvent(this));
+        auto const& bus = AppRegistry::instance().bus();
+        bus->publish(new ScriptExecutingEvent(this));
        _scriptInfo.setScript(QtUtils::toQString(script));
-        AppRegistry::instance().bus()->send(_server->client(), new ExecuteScriptRequest(this, query(), dbName));
+        bus->send(_server->worker(), new ExecuteScriptRequest(this, query(), dbName));
        LOG_MSG(_scriptInfo.script(), mongo::logger::LogSeverity::Info());
    }

@@ -33,23 +33,22 @@ namespace Robomongo
        return QtUtils::toStdString(_scriptInfo.script()); 
    }

-    void MongoShell::execute(const std::string &dbName)
+    void MongoShell::execute(const std::string &script /* = "" */, const std::string &dbName /* = "" */)
    {
-        if (_scriptInfo.execute()) {
-            AppRegistry::instance().bus()->publish(new ScriptExecutingEvent(this));
-            AppRegistry::instance().bus()->send(_server->client(), new ExecuteScriptRequest(this, query(), dbName));
-            if(!_scriptInfo.script().isEmpty())
-                LOG_MSG(_scriptInfo.script(), mongo::logger::LogSeverity::Info());
-        } else {
-            AppRegistry::instance().bus()->publish(new ScriptExecutingEvent(this));
-            _scriptInfo.setScript("");
-            AppRegistry::instance().bus()->send(_server->client(), new ExecuteScriptRequest(this,query() , dbName));
-        }
+        if (!_scriptInfo.execute())
+            return;
+
+        std::string const finalScript = script.empty() ? query() : script;
+        AppRegistry::instance().bus()->publish(new ScriptExecutingEvent(this));
+        AppRegistry::instance().bus()->send(_server->worker(), 
+            new ExecuteScriptRequest(this, finalScript, dbName, _aggrInfo));
+        if (!_scriptInfo.script().isEmpty())
+            LOG_MSG(_scriptInfo.script(), mongo::logger::LogSeverity::Info());
    }

    void MongoShell::query(int resultIndex, const MongoQueryInfo &info)
    {
-        AppRegistry::instance().bus()->send(_server->client(), new ExecuteQueryRequest(this, resultIndex, info));
+        AppRegistry::instance().bus()->send(_server->worker(), new ExecuteQueryRequest(this, resultIndex, info));
    }

    void MongoShell::autocomplete(const std::string &prefix)
@@ -57,12 +56,12 @@ namespace Robomongo
        AutocompletionMode autocompletionMode = AppRegistry::instance().settingsManager()->autocompletionMode();
        if (autocompletionMode == AutocompleteNone)
            return;
-        AppRegistry::instance().bus()->send(_server->client(), new AutocompleteRequest(this, prefix, autocompletionMode));
+        AppRegistry::instance().bus()->send(_server->worker(), new AutocompleteRequest(this, prefix, autocompletionMode));
    }

    void MongoShell::stop()
    {
-        // _server->client()->interrupt();
+        // _server->worker()->interrupt();
        // mongo::Scope::setInterruptFlag(true);
    }

@@ -94,11 +93,23 @@ namespace Robomongo
    void MongoShell::handle(ExecuteScriptResponse *event)
    {
        if (event->isError()) {
-            AppRegistry::instance().bus()->publish(new ScriptExecutedEvent(this, event->error()));
-            return;
+            if (_server->connectionRecord()->isReplicaSet()) {
+                AppRegistry::instance().bus()->publish(
+                    new ReplicaSetRefreshed(this, event->error(), event->error().replicaSetInfo()));
+
+                AppRegistry::instance().bus()->publish(
+                    new ScriptExecutedEvent(this, event->error(), event->timeoutReached()));
+                return;
+            }
+            else {  // single server
+                AppRegistry::instance().bus()->publish(
+                    new ScriptExecutedEvent(this, event->error(), event->timeoutReached()));
+                return;
+            }
        }

-        AppRegistry::instance().bus()->publish(new ScriptExecutedEvent(this, event->result, event->empty));
+        AppRegistry::instance().bus()->publish(new ScriptExecutedEvent(this, event->result, event->empty,
+                                                                       event->timeoutReached()));
    }

    void MongoShell::handle(AutocompleteResponse *event)
@@ -2,15 +2,18 @@
 #include <QObject>
 #include "robomongo/core/events/MongoEvents.h"
 #include "robomongo/core/domain/ScriptInfo.h"
+#include "robomongo/core/domain/MongoAggregateInfo.h"

 namespace Robomongo
 {
+    struct AggrInfo;
+
    class MongoShell : public QObject
    {
        Q_OBJECT

    public:
-        MongoShell(MongoServer *server,const ScriptInfo &scriptInfo);
+        MongoShell(MongoServer *server, ScriptInfo scriptInfo);

        void open(const std::string &script, const std::string &dbName = std::string());
        void query(int resultIndex, const MongoQueryInfo &info);
@@ -18,11 +21,14 @@ namespace Robomongo
        void stop();
        MongoServer *server() const { return _server; }
        std::string query() const;
-        void execute(const std::string &dbName = std::string());
-        bool isExecutable() const {return _scriptInfo.execute(); }
+        void execute(const std::string &script = "", const std::string &dbName = "");
+        bool isExecutable() const { return _scriptInfo.execute(); }
        const QString &title() const { return _scriptInfo.title(); }
+        std::string dbname() const { return _scriptInfo.dbname(); }
        const CursorPosition &cursor() const { return _scriptInfo.cursor(); }
        void setScript(const QString &script) { return _scriptInfo.setScript(script); }
+        void setScriptExecutable(bool execute) { return _scriptInfo.setExecutable(execute); }
+        void setAggrInfo(AggrInfo const& aggrInfo) { _aggrInfo = aggrInfo; }
        QString filePath() const { return _scriptInfo.filePath(); }

        bool saveToFile();
@@ -36,6 +42,7 @@ namespace Robomongo

    private:        
        ScriptInfo _scriptInfo;
+        AggrInfo _aggrInfo;
        MongoServer *_server;
    };

@@ -1,21 +0,0 @@
-#include "robomongo/core/domain/MongoShellResult.h"
-
-namespace Robomongo
-{
-    MongoShellResult::MongoShellResult(const std::string &type, const std::string &response, const MongoDocumentPtrContainerType &documents,
-                     const MongoQueryInfo &queryInfo, qint64 elapsedms) :
-        _type(type),
-        _response(response),
-        _documents(documents),
-        _queryInfo(queryInfo),
-        _elapsedms(elapsedms) { }
-
-    MongoShellExecResult::MongoShellExecResult(const std::vector<MongoShellResult> &results,
-                         const std::string &currentServer, bool isCurrentServerValid,
-                         const std::string &currentDatabase, bool isCurrentDatabaseValid) :
-        _results(results),
-        _currentServer(currentServer),
-        _currentDatabase(currentDatabase),
-        _isCurrentServerValid(isCurrentServerValid),
-        _isCurrentDatabaseValid(isCurrentDatabaseValid) { }
-}
@@ -1,43 +1,85 @@
 #pragma once
 #include "robomongo/core/domain/MongoQueryInfo.h"
+#include "robomongo/core/domain/MongoAggregateInfo.h"
 #include "robomongo/core/domain/MongoDocument.h"

 namespace Robomongo
 {
+    /* --------------  MongoShellResult Class --------- */
    class MongoShellResult
    {
    public:
        typedef std::vector<MongoDocumentPtr> MongoDocumentPtrContainerType;
-        MongoShellResult(const std::string &type, const std::string &response, const MongoDocumentPtrContainerType &documents,
-                         const MongoQueryInfo &queryInfo, qint64 elapsedms);
+        MongoShellResult(
+            const std::string &type, const std::string &response,
+            const MongoDocumentPtrContainerType &documents,
+            const MongoQueryInfo &queryInfo, const std::string &statement,
+            qint64 elapsedms, AggrInfo aggrInfo = AggrInfo()) :
+            _type(type),
+            _response(response),
+            _documents(documents),
+            _queryInfo(queryInfo),
+            _statement(statement),
+            _elapsedms(elapsedms),
+            _aggrInfo(aggrInfo)
+        { }

        std::string response() const { return _response; }
        std::string type() const { return _type; }
        MongoDocumentPtrContainerType documents() const { return _documents; }
        MongoQueryInfo queryInfo() const { return _queryInfo; }
+        std::string statement() const { return _statement; }
+        std::string statementShort() const {
+            std::size_t const LEN = _statement.size() < 10 ? _statement.size() : 10;
+            std::string statementShort { _statement, 0, LEN };
+            statementShort.append((_statement.size() > 10) ? ".." : "");
+            return statementShort;
+        }
+
        qint64 elapsedMs() const { return _elapsedms; }
+        AggrInfo const& aggrInfo() const { return _aggrInfo; }

    private:
        std::string _type;
        std::string _response;
        MongoDocumentPtrContainerType _documents;
        MongoQueryInfo _queryInfo;
+        std::string const _statement;
        qint64 _elapsedms;
+        AggrInfo _aggrInfo = AggrInfo();
    };

+    /* --------------  MongoShellExecResult Class --------- */
    class MongoShellExecResult
    {
    public:
        MongoShellExecResult() { }
-        MongoShellExecResult(const std::vector<MongoShellResult> &results,
-                             const std::string &currentServer, bool isCurrentServerValid,
-                             const std::string &currentDatabase, bool isCurrentDatabaseValid);

-        std::vector<MongoShellResult> results() const { return _results; }
+        MongoShellExecResult(
+            const std::vector<MongoShellResult> &results,
+            const std::string &currentServer, bool isCurrentServerValid,
+            const std::string &currentDatabase, bool isCurrentDatabaseValid,
+            bool timeoutReached = false) :
+            _results(results),
+            _currentServer(currentServer),
+            _currentDatabase(currentDatabase),
+            _isCurrentServerValid(isCurrentServerValid),
+            _isCurrentDatabaseValid(isCurrentDatabaseValid),
+            _timeoutReached(timeoutReached)
+        { }
+
+        MongoShellExecResult(bool error, std::string const& errorMsg = "", bool timeoutReached = false) : 
+            _error(error), _errorMessage(errorMsg), _timeoutReached(timeoutReached) { }
+
+        std::vector<MongoShellResult> const& results() const { return _results; }
        std::string currentServer() const { return _currentServer; }
-        std::string currentDatabase() const { return _currentDatabase; }
+        void setCurrentServer(std::string const& server) { _currentServer = server; }
+        std::string currentDatabase() const { return _currentDatabase; }        
        bool isCurrentServerValid() const { return _isCurrentServerValid; }
        bool isCurrentDatabaseValid() const { return _isCurrentDatabaseValid; }
+        std::string errorMessage() const { return _errorMessage; }
+        bool error() const { return _error; }
+        bool timeoutReached() const { return _timeoutReached; }

    private:
        std::vector<MongoShellResult> _results;
@@ -45,5 +87,8 @@ namespace Robomongo
        std::string _currentDatabase;
        bool _isCurrentServerValid;
        bool _isCurrentDatabaseValid;
+        std::string _errorMessage;
+        bool _error = false;
+        bool _timeoutReached = false;
    };
 }
@@ -1,63 +0,0 @@
-#include "robomongo/core/domain/MongoUser.h"
-
-#include <mongo/client/dbclientinterface.h>
-
-#include "robomongo/core/utils/BsonUtils.h"
-
-namespace Robomongo
-{
-    const float MongoUser::minimumSupportedVersion = 2.4f;
-
-    MongoUser::MongoUser(const float version, const mongo::BSONObj &obj) :
-        _version(version), _readOnly(false)
-    {
-        _id = obj.getField("_id").OID();
-        _name = BsonUtils::getField<mongo::String>(obj,"user");
-        _passwordHash = BsonUtils::getField<mongo::String>(obj,"pwd");
-        if (_version<minimumSupportedVersion) {
-            _readOnly = BsonUtils::getField<mongo::Bool>(obj,"readOnly");
-        }     
-        else {
-            _userSource = BsonUtils::getField<mongo::String>(obj,"userSource");
-            std::vector<mongo::BSONElement> roles = BsonUtils::getField<mongo::Array>(obj, "roles");
-            for (std::vector<mongo::BSONElement>::const_iterator it = roles.begin(); it!= roles.end(); ++it)
-            {
-                _role.push_back(BsonUtils::bsonelement_cast<std::string>(*it));
-            }
-        }
-    }
-
-    MongoUser::MongoUser(const float version) :
-        _version(version),_readOnly(false),_role() {}
-
-    mongo::BSONObj MongoUser::toBson() const
-    {
-        mongo::BSONObjBuilder builder;
-
-        if (!(_id == mongo::OID())) // if not empty (i.e. not Object("0000000000000000"))
-            builder.append("_id", _id);
-
-        builder.append("user", _name);
-
-        if (!_passwordHash.empty())
-            builder.append("pwd", _passwordHash);
-
-        if (_version<minimumSupportedVersion) {
-            builder.append("readOnly", _readOnly);
-        }
-        else {
-            if (!_userSource.empty())
-                builder.append("userSource", _userSource);
-
-            mongo::BSONArrayBuilder builderA;
-            for (RoleType::const_iterator it = _role.begin(); it!=_role.end(); ++it)
-            {
-                builderA << *it;
-            }
-            mongo::BSONObj arObj = builderA.arr();            
-            builder.appendArray("roles", arObj);
-        }
-        mongo::BSONObj obj = builder.obj();
-        return obj;
-    }
-}
@@ -2,46 +2,45 @@
 #include <mongo/bson/bsonobj.h>
 #include <mongo/bson/bsonelement.h>

+#include "robomongo/core/utils/BsonUtils.h"
+
 namespace Robomongo
 {
    class MongoUser
    {
    public:
-        typedef std::vector<std::string> RoleType;
-        /**
-         * @brief Creates user from "system.users" document
-         */
-        explicit MongoUser(const float version, const mongo::BSONObj &obj);
+        typedef std::vector<std::string> RolesVector;

-        /**
-         * @brief Creates new user with empty attributes
-         */
-        MongoUser(const float version);
+        explicit MongoUser(const float version, const mongo::BSONObj &obj) :
+            _version(version), _readOnly(false),
+            _name(BsonUtils::getField<mongo::String>(obj, "user"))
+        {};
+
+        // Creates new user with empty attributes
+        MongoUser(const float version) :
+             _version(version), _readOnly(false), _roles() {}

-        mongo::OID id() const { return _id; }
        std::string name() const { return _name; }
-        RoleType role() const { return _role; }
-        std::string passwordHash() const { return _passwordHash; }
+        std::string password() const { return _password; }
+        std::vector<std::string> roles() const { return _roles; }

        void setName(const std::string &name) { _name = name; }
-        void setRole(const RoleType &role) { _role = role; }
-        void setPasswordHash(const std::string &hash) { _passwordHash = hash; }
+        void setPassword(const std::string &pwd) { _password = pwd; }
+        void setRoles(const std::vector<std::string> &roles) { _roles = roles; }

        std::string userSource() const { return _userSource; }
        void setUserSource(const std::string &source) { _userSource = source; }
-        mongo::BSONObj toBson() const;
        bool readOnly() const { return _readOnly; }
        void setReadOnly(bool readonly) { _readOnly = readonly; }

        float version() const { return _version; }
-        static const float minimumSupportedVersion;
+        static constexpr float minimumSupportedVersion = 2.4f;
    private:
        float _version;
-        mongo::OID _id;
        std::string _name;
        bool _readOnly;
-        RoleType _role;
-        std::string _passwordHash;
+        RolesVector _roles;
+        std::string _password;
        std::string _userSource;
    };
-}
+}
@@ -1,5 +1,8 @@
 #include "robomongo/core/domain/Notifier.h"

+#include <thread>
+#include <chrono>
+
 #include <QAction>
 #include <QClipboard>
 #include <QApplication>
@@ -15,6 +18,7 @@

 #include "robomongo/shell/db/ptimeutil.h"

+#include "robomongo/gui/MainWindow.h"
 #include "robomongo/gui/widgets/workarea/BsonTreeItem.h"
 #include "robomongo/gui/dialogs/DocumentTextEditor.h"
 #include "robomongo/gui/utils/DialogUtils.h"
@@ -25,10 +29,10 @@ namespace Robomongo
 {
    namespace detail
    {
-        bool isSimpleType(Robomongo::BsonTreeItem *item)
+        bool isSimpleType(Robomongo::BsonTreeItem const *item)
        {
-            return Robomongo::BsonUtils::isSimpleType(item->type())
-                || Robomongo::BsonUtils::isUuidType(item->type(), item->binType());
+            return BsonUtils::isSimpleType(item->type()) ||
+                   BsonUtils::isUuidType(item->type(), item->binType());
        }

        bool isObjectIdType(Robomongo::BsonTreeItem *item)
@@ -38,12 +42,22 @@ namespace Robomongo

        bool isMultiSelection(const QModelIndexList &indexes)
        {
-            return indexes.count()>1;
+            return indexes.count() > 1;
        }

-        bool isDocumentType(BsonTreeItem *item)
+        bool isDocumentType(BsonTreeItem const *item)
        {
-            return Robomongo::BsonUtils::isDocument(item->type());
+            return BsonUtils::isDocument(item->type());
+        }
+
+        bool isArrayChild(BsonTreeItem const *item)
+        {
+            return BsonUtils::isArray(dynamic_cast<BsonTreeItem*>(item->parent())->type());
+        }
+
+        bool isDocumentRoot(BsonTreeItem const *item)
+        {
+            return ( item == item->superParent() );
        }

        /**
@@ -55,20 +69,20 @@ namespace Robomongo
        QModelIndexList uniqueRows(QModelIndexList indexes, bool returnSuperParents)
        {
            QModelIndexList result;
-            for (QModelIndexList::const_iterator it = indexes.begin(); it!=indexes.end(); ++it)
+            for (QModelIndexList::const_iterator it = indexes.begin(); it != indexes.end(); ++it)
            {
                QModelIndex isUnique = *it;
                Robomongo::BsonTreeItem *item = Robomongo::QtUtils::item<Robomongo::BsonTreeItem*>(isUnique);
-                if(item){                
-                    for (QModelIndexList::const_iterator jt = result.begin(); jt!=result.end(); ++jt)
+                if (item) {
+                    for (QModelIndexList::const_iterator jt = result.begin(); jt != result.end(); ++jt)
                    {
                        Robomongo::BsonTreeItem *jItem = Robomongo::QtUtils::item<Robomongo::BsonTreeItem*>(*jt);
-                        if (jItem && jItem->superParent() == item->superParent()){
+                        if (jItem && jItem->superParent() == item->superParent()) {
                            isUnique = QModelIndex();
                            break;
                        }
                    }
-                    if (isUnique.isValid()){
+                    if (isUnique.isValid()) {
                        if (returnSuperParents) {
                            // Move index onto "super parent" element before pushing it into result set
                            QModelIndex parent = isUnique.parent();
@@ -92,8 +106,8 @@ namespace Robomongo
        _queryInfo(queryInfo)
    {
        QWidget *wid = dynamic_cast<QWidget*>(_observer);
-        AppRegistry::instance().bus()->subscribe(this, InsertDocumentResponse::Type);
-        AppRegistry::instance().bus()->subscribe(this, RemoveDocumentResponse::Type);
+        AppRegistry::instance().bus()->subscribe(this, InsertDocumentResponse::Type, _shell->server());
+        AppRegistry::instance().bus()->subscribe(this, RemoveDocumentResponse::Type, _shell->server());

        _deleteDocumentAction = new QAction("Delete Document...", wid);
        VERIFY(connect(_deleteDocumentAction, SIGNAL(triggered()), SLOT(onDeleteDocument())));
@@ -113,6 +127,12 @@ namespace Robomongo
        _copyValueAction = new QAction("Copy Value", wid);
        VERIFY(connect(_copyValueAction, SIGNAL(triggered()), SLOT(onCopyDocument())));

+        _copyValueNameAction = new QAction("Copy Name", wid);
+        VERIFY(connect(_copyValueNameAction, SIGNAL(triggered()), SLOT(onCopyNameDocument())));
+
+        _copyValuePathAction = new QAction("Copy Path", wid);
+        VERIFY(connect(_copyValuePathAction, SIGNAL(triggered()), SLOT(onCopyPathDocument())));
+
        _copyTimestampAction = new QAction("Copy Timestamp from ObjectId", wid);
        VERIFY(connect(_copyTimestampAction, SIGNAL(triggered()), SLOT(onCopyTimestamp())));

@@ -122,26 +142,36 @@ namespace Robomongo

    void Notifier::initMenu(QMenu *const menu, BsonTreeItem *const item)
    {
-        bool isEditable = _queryInfo._info.isValid();
-        bool onItem = item ? true : false;
+        bool const isProjection = !_queryInfo._fields.isEmpty();
+        bool const isEditable = _queryInfo._info.isValid() && !isProjection;
+        bool const onItem = item ? true : false;
        
        bool isSimple = false;
        bool isDocument = false;
        bool isObjectId = false;
+        bool isNotArrayChild = false;
+        bool isRoot = false;

        if (item) {
            isSimple = detail::isSimpleType(item);
            isDocument = detail::isDocumentType(item);
            isObjectId = detail::isObjectIdType(item);
+            isNotArrayChild = !detail::isArrayChild(item);
+            isRoot = detail::isDocumentRoot(item);
        }

        if (onItem && isEditable) menu->addAction(_editDocumentAction);
        if (onItem)               menu->addAction(_viewDocumentAction);
        if (isEditable)           menu->addAction(_insertDocumentAction);
-
        if (onItem && (isSimple || isDocument)) menu->addSeparator();
-
        if (onItem && isSimple)   menu->addAction(_copyValueAction);
+
+        if (onItem && (isSimple || isDocument) && isNotArrayChild && !isRoot)
+            menu->addAction(_copyValueNameAction);
+
+        if (onItem && (isSimple || isDocument) && !isRoot)
+            menu->addAction(_copyValuePathAction);
+
        if (onItem && isObjectId) menu->addAction(_copyTimestampAction);
        if (onItem && isDocument) menu->addAction(_copyJsonAction);
        if (onItem && isEditable) menu->addSeparator();
@@ -156,11 +186,12 @@ namespace Robomongo
        if (isEditable) menu->addAction(_deleteDocumentsAction);
    }

-    void Notifier::deleteDocuments(std::vector<BsonTreeItem*> items, bool force)
+    void Notifier::deleteDocuments(std::vector<BsonTreeItem*> const& items, bool force)
    {
        bool isNeededRefresh = false;
-        for (std::vector<BsonTreeItem*>::const_iterator it = items.begin(); it != items.end(); ++it) {
-            BsonTreeItem * documentItem = *it;
+
+        int index = 0;
+        for (auto const * const documentItem : items) {
            if (!documentItem)
                break;

@@ -168,7 +199,8 @@ namespace Robomongo
            mongo::BSONElement id = obj.getField("_id");

            if (id.eoo()) {
-                QMessageBox::warning(dynamic_cast<QWidget*>(_observer), "Cannot delete", "Selected document doesn't have _id field. \n"
+                QMessageBox::warning(dynamic_cast<QWidget*>(_observer), "Cannot delete", 
+                    "Selected document doesn't have _id field. \n"
                    "Maybe this is a system document that should be managed in a special way?");
                break;
            }
@@ -187,45 +219,113 @@ namespace Robomongo
                    break;
            }

-            isNeededRefresh=true;
-            _shell->server()->removeDocuments(query, _queryInfo._info._ns);
-        }
+            isNeededRefresh = true;

-        if (isNeededRefresh)
-            _shell->query(0, _queryInfo);
+            RemoveDocumentCount removeCount = items.size() == 1 ? RemoveDocumentCount::ONE :  
+                                                                  RemoveDocumentCount::MULTI;
+            _shell->server()->removeDocuments(query, _queryInfo._info._ns, removeCount, index);
+            ++index;
+            mainWindow()->showQueryWidgetProgressBar();
+        }
    }

    void Notifier::handle(InsertDocumentResponse *event)
    {
-        if (event->isError()) {
-            QMessageBox::warning(NULL, "Database Error", QString::fromStdString(event->error().errorMessage()));
+        if (event->isError()) { // Error
+            mainWindow()->hideQueryWidgetProgressBar();        
+            if (_shell->server()->connectionRecord()->isReplicaSet()) {
+                // Insert document from tab results window (Notifier, OutputWindow widget)
+                if (EventError::SetPrimaryUnreachable == event->error().errorCode()) {
+                    AppRegistry::instance().bus()->publish(
+                        new ReplicaSetRefreshed(_shell, event->error(), event->error().replicaSetInfo()));
+                }
+            }
+            else  // single server
+                QMessageBox::warning(NULL, "Database Error", QString::fromStdString(event->error().errorMessage()));
+
            return;
        }

+        // Success
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
        _shell->query(0, _queryInfo);
    }

    void Notifier::handle(RemoveDocumentResponse *event)
    {
-        if (event->isError()) {
-            // Commented because when you'll delete multiple documents,
-            // we'll receive this event as many times as many selected
-            // documents you have. This is incorrect and remove of
-            // multiple documents should be a single command, instead
-            // of many. Error message should be printed in the logs.
+       if (event->isError()) {
+            if (!(event->removeCount == RemoveDocumentCount::MULTI && event->index > 0))
+                QMessageBox::warning(NULL, "Database Error", QString::fromStdString(event->error().errorMessage()));
+       }
+       else {   // Success
+           std::this_thread::sleep_for(std::chrono::milliseconds(100));
+           _shell->query(0, _queryInfo);
+       }
+    }

-            // QMessageBox::warning(NULL, "Database Error", QString::fromStdString(event->error().errorMessage()));
+    void Notifier::onCopyNameDocument()
+    {
+        QModelIndex const& selectedInd = _observer->selectedIndex();
+        if (!selectedInd.isValid())
            return;
+
+        BsonTreeItem const *documentItem = QtUtils::item<BsonTreeItem*>(selectedInd);
+        if (!documentItem)
+            return;
+
+        if (!(detail::isSimpleType(documentItem) || detail::isDocumentType(documentItem) ||
+            !detail::isArrayChild(documentItem) || !detail::isDocumentRoot(documentItem)))
+            return;
+
+        QClipboard *clipboard = QApplication::clipboard();
+        clipboard->setText(QString::fromStdString(documentItem->fieldName()));
+    }
+
+    void Notifier::onCopyPathDocument()
+    {
+        QModelIndex const& selectedInd = _observer->selectedIndex();
+        if (!selectedInd.isValid())
+            return;
+
+        BsonTreeItem const *documentItem = QtUtils::item<BsonTreeItem*>(selectedInd);
+        if (!documentItem)
+            return;
+
+        if (!(detail::isSimpleType(documentItem) || detail::isDocumentType(documentItem) ||
+            !detail::isDocumentRoot(documentItem)))
+            return;
+
+        QStringList namesList;
+        BsonTreeItem const *documentItemHelper = documentItem;
+
+        while (!detail::isDocumentRoot(documentItemHelper)) {
+            if (!detail::isArrayChild(documentItemHelper)) {
+                namesList.push_front(QString::fromStdString(documentItemHelper->fieldName()));
+            }
+
+            documentItemHelper = dynamic_cast<BsonTreeItem*>(documentItemHelper->parent());
        }
+
+        QClipboard *clipboard = QApplication::clipboard();
+        clipboard->setText(namesList.join("."));
+    }
+
+    MainWindow* Notifier::mainWindow() const
+    {
+        MainWindow* mainWindow;
+        for (auto wid : QApplication::topLevelWidgets()) {
+            if ((mainWindow = qobject_cast<MainWindow*>(wid)))
+                break;
+        }
+        return mainWindow;
    }

    void Notifier::handleDeleteCommand()
    {
-        if (_observer->selectedIndexes().count() > 1) {
+        if (_observer->selectedIndexes().count() > 1) 
            onDeleteDocuments();
-        } else {
-            onDeleteDocument();
-        }
+        else 
+            onDeleteDocument();        
    }

    void Notifier::onDeleteDocuments()
@@ -237,14 +337,16 @@ namespace Robomongo
        if (!detail::isMultiSelection(selectedIndexes))
            return;

-        int answer = QMessageBox::question(dynamic_cast<QWidget*>(_observer), "Delete", QString("Do you want to delete %1 selected documents?").arg(selectedIndexes.count()));
-        if (answer == QMessageBox::Yes) {
+        int const answer = QMessageBox::question(dynamic_cast<QWidget*>(_observer), "Delete", 
+                                           QString("Do you want to delete %1 selected documents?").
+                                           arg(selectedIndexes.count()));
+
+        if (QMessageBox::Yes == answer) {
            std::vector<BsonTreeItem*> items;
-            for (QModelIndexList::const_iterator it = selectedIndexes.begin(); it!= selectedIndexes.end(); ++it) {
-                BsonTreeItem *item = QtUtils::item<BsonTreeItem*>(*it);
-                items.push_back(item);                
-            }
-            deleteDocuments(items,true);
+            for (auto index : selectedIndexes) 
+                items.push_back(QtUtils::item<BsonTreeItem*>(index));
+            
+            deleteDocuments(items, true);
        }
    }

@@ -260,7 +362,7 @@ namespace Robomongo
        BsonTreeItem *documentItem = QtUtils::item<BsonTreeItem*>(selectedIndex);
        std::vector<BsonTreeItem*> vec;
        vec.push_back(documentItem);
-        return deleteDocuments(vec,false);
+        return deleteDocuments(vec, false);
    }

    void Notifier::onEditDocument()
@@ -276,22 +378,20 @@ namespace Robomongo
        if (!documentItem)
            return;

-        mongo::BSONObj obj = documentItem->superRoot();
-
-        std::string str = BsonUtils::jsonString(obj, mongo::TenGen, 1,
-            AppRegistry::instance().settingsManager()->uuidEncoding(),
-            AppRegistry::instance().settingsManager()->timeZone());
+        std::string str = BsonUtils::jsonString(documentItem->superRoot(), mongo::TenGen, 1,
+                                                AppRegistry::instance().settingsManager()->uuidEncoding(),
+                                                AppRegistry::instance().settingsManager()->timeZone());

        const QString &json = QtUtils::toQString(str);

-        DocumentTextEditor editor(_queryInfo._info,
-            json, false, dynamic_cast<QWidget*>(_observer));
+        DocumentTextEditor editor(_queryInfo._info, json, false, dynamic_cast<QWidget*>(_observer));

        editor.setWindowTitle("Edit Document");
        int result = editor.exec();

        if (result == QDialog::Accepted) {
            _shell->server()->saveDocuments(editor.bsonObj(), _queryInfo._info._ns);
+            mainWindow()->showQueryWidgetProgressBar();
        }
    }

@@ -338,9 +438,8 @@ namespace Robomongo
        DocumentTextEditor::ReturnType obj = editor.bsonObj();
        for (DocumentTextEditor::ReturnType::const_iterator it = obj.begin(); it != obj.end(); ++it) {
            _shell->server()->insertDocument(*it, _queryInfo._info._ns);
+            mainWindow()->showQueryWidgetProgressBar();
        }
-
-        _shell->query(0, _queryInfo);
    }

    void Notifier::onCopyDocument()
@@ -376,19 +475,19 @@ namespace Robomongo
        QClipboard *clipboard = QApplication::clipboard();

        // new Date(parseInt(this.valueOf().slice(0,8), 16)*1000);
-        QString hexTimestamp = documentItem->value().mid(10,8);
+        QString hexTimestamp = documentItem->value().mid(10, 8);
        bool ok;
-        long long milliTimestamp = (long long)hexTimestamp.toLongLong(&ok,16)*1000;
+        long long milliTimestamp = (long long)hexTimestamp.toLongLong(&ok, 16)*1000;

        bool isSupportedDate = (miutil::minDate < milliTimestamp) && (milliTimestamp < miutil::maxDate);

-        boost::posix_time::ptime epoch(boost::gregorian::date(1970,1,1));
+        boost::posix_time::ptime epoch(boost::gregorian::date(1970, 1, 1));
        boost::posix_time::time_duration diff = boost::posix_time::millisec(milliTimestamp);
        boost::posix_time::ptime time = epoch + diff;

-        if(isSupportedDate)
+        if (isSupportedDate)
        {
-            std::string date = miutil::isotimeString(time,false,false);
+            std::string date = miutil::isotimeString(time, false, false);
            clipboard->setText("ISODate(\""+QString::fromStdString(date)+"\")");
        }
        else {
@@ -411,13 +510,13 @@ namespace Robomongo

         QClipboard *clipboard = QApplication::clipboard();
         mongo::BSONObj obj = documentItem->root();
-         if (documentItem != documentItem->superParent()){
-             obj = obj[QtUtils::toStdString(documentItem->key())].Obj();
+         if (documentItem != documentItem->superParent()) {
+             obj = obj[documentItem->fieldName()].Obj();
         }
         bool isArray = BsonUtils::isArray(documentItem->type());
         std::string str = BsonUtils::jsonString(obj, mongo::TenGen, 1,
                 AppRegistry::instance().settingsManager()->uuidEncoding(),
-                 AppRegistry::instance().settingsManager()->timeZone(),isArray);
+                 AppRegistry::instance().settingsManager()->timeZone(), isArray);

         const QString &json = QtUtils::toQString(str);
         clipboard->setText(json);
@@ -11,17 +11,18 @@ QT_END_NAMESPACE

 namespace Robomongo
 {
+    class MainWindow;
    class MongoShell;
    class BsonTreeItem;
    class InsertDocumentResponse;
-    class RemoveDocumentResponse;
+    struct RemoveDocumentResponse;

    namespace detail
    {
-        bool isSimpleType(BsonTreeItem *item);
+        bool isSimpleType(BsonTreeItem const *item);
        bool isObjectIdType(BsonTreeItem *item);
        bool isMultiSelection(const QModelIndexList &indexes);
-        bool isDocumentType(BsonTreeItem *item);
+        bool isDocumentType(BsonTreeItem const *item);
        QModelIndexList uniqueRows(QModelIndexList indexes, bool returnSuperParents = false);
    }

@@ -45,7 +46,7 @@ namespace Robomongo
        void initMenu(QMenu *const menu, BsonTreeItem *const item);
        void initMultiSelectionMenu(QMenu *const menu);

-        void deleteDocuments(std::vector<BsonTreeItem*> items, bool force);
+        void deleteDocuments(std::vector<BsonTreeItem*> const& items, bool force);
        void handleDeleteCommand();

    public Q_SLOTS:
@@ -60,13 +61,21 @@ namespace Robomongo
        void handle(InsertDocumentResponse *event);
        void handle(RemoveDocumentResponse *event);

+    private Q_SLOTS:
+        void onCopyNameDocument();
+        void onCopyPathDocument();
+
    private:
+        MainWindow* mainWindow() const;
+
        QAction *_deleteDocumentAction;
        QAction *_deleteDocumentsAction;
        QAction *_editDocumentAction;
        QAction *_viewDocumentAction;
        QAction *_insertDocumentAction;
        QAction *_copyValueAction;
+        QAction *_copyValueNameAction;
+        QAction *_copyValuePathAction;
        QAction *_copyTimestampAction;
        QAction *_copyJsonAction;
        const MongoQueryInfo _queryInfo;
@@ -62,10 +62,11 @@ namespace

 namespace Robomongo
 {
-    ScriptInfo::ScriptInfo(const QString &script, bool execute,const CursorPosition &position,
-                           const QString &title, const QString &filePath) :
+    ScriptInfo::ScriptInfo(const QString &script, bool execute, const std::string &dbname, 
+                           const CursorPosition &position, const QString &title, const QString &filePath) :
        _script(script),
        _execute(execute),
+        _dbname(dbname),
        _title(title),
        _cursor(position),
        _filePath(filePath) {}
@@ -73,10 +74,10 @@ namespace Robomongo
    bool ScriptInfo::loadFromFile(const QString &filePath)
    {
        bool result = false;
-        QString filepath = QFileDialog::getOpenFileName(QApplication::activeWindow(), filePath,QString(), filterForScripts);
+        QString filepath = QFileDialog::getOpenFileName(QApplication::activeWindow(), filePath, QString(), filterForScripts);
        if (!filepath.isEmpty()) {
            QString out;
-            if (loadFromFileText(filepath,out)) {
+            if (loadFromFileText(filepath, out)) {
                _script = out;
                _filePath = filepath;
                result = true;
@@ -95,7 +96,7 @@ namespace Robomongo
        QString filepath = QFileDialog::getSaveFileName(QApplication::activeWindow(),
            QObject::tr("Save As"), _filePath, filterForScripts);

-        if (saveToFileText(filepath,_script)) {
+        if (saveToFileText(filepath, _script)) {
            _filePath = filepath;
            return true;
        }
@@ -9,12 +9,14 @@ namespace Robomongo
    class ScriptInfo
    {
    public:
-         ScriptInfo(const QString &script, bool execute = false,
+         ScriptInfo(const QString &script, bool execute = false, const std::string &dbname = "",
                   const CursorPosition &position = CursorPosition(),
                   const QString &title = QString(), const QString &filePath = QString());

        bool execute() const { return _execute; }
+        void setExecutable(bool execute) { _execute = execute; }
        QString script() const { return _script; }
+        std::string dbname() const { return _dbname; }
        const QString &title() const { return _title; }
        const CursorPosition &cursor() const { return _cursor; }
        void setScript(const QString &script) { _script = script; }
@@ -26,7 +28,8 @@ namespace Robomongo

    private:
        QString _script;
-        const bool _execute;
+        std::string _dbname;
+        bool _execute;
        const QString _title;
        const CursorPosition _cursor;
        QString _filePath;
@@ -15,6 +15,7 @@
 //#include <third_party/js-1.7/jsstr.h>

 #include <mongo/util/assert_util.h>
+#include <mongo/util/exit_code.h>
 #include <mongo/scripting/engine.h>

 // v0.9
@@ -50,39 +51,34 @@ namespace
 namespace mongo {
    extern bool isShell;
    void logProcessDetailsForLogRotate() {}
-    void exitCleanly(ExitCode code) {}
 }

 namespace Robomongo
 {
-    ScriptEngine::ScriptEngine(ConnectionSettings *connection) :
+    ScriptEngine::ScriptEngine(ConnectionSettings *connection, int timeoutSec) :
        _connection(connection),
-        _scope(NULL),
+        _scope(nullptr),
        _engine(NULL),
+        _timeoutSec(timeoutSec),
+        _initialized(false),
        _mutex(QMutex::Recursive) { }

    ScriptEngine::~ScriptEngine()
    {
-        QMutexLocker lock(&_mutex);
-
-        delete _scope;
-        _scope = NULL;
-
-//        delete _engine;
-//        _engine = NULL;
    }

-    void ScriptEngine::init(bool isLoadMongoRcJs)
+    void ScriptEngine::init(bool isLoadMongoRcJs, const std::string& serverAddr, const std::string& dbName)
    {
        QMutexLocker lock(&_mutex);

-        std::string connectDatabase = "test";
+        std::string connectDatabase = dbName.empty() ? "test" : dbName;

        if (_connection->hasEnabledPrimaryCredential())
            connectDatabase = _connection->primaryCredential()->databaseName();

        std::stringstream ss;
-        ss << "db = connect('" << _connection->info().toString() << "/" << connectDatabase;
+        auto hostAndPort = serverAddr.empty() ? _connection->hostAndPort().toString() : serverAddr;
+        ss << "db = connect('" << hostAndPort << "/" << connectDatabase;

 //        v0.9
 //        ss << "db = connect('" << _connection->serverHost() << ":" << _connection->serverPort() << _connection->sslInfo() << _connection->sshInfo() << "/" << connectDatabase;
@@ -102,53 +98,86 @@ namespace Robomongo
            // mongo::isShell = true;

            mongo::ScriptEngine::setConnectCallback( mongo::shell_utils::onConnect );
-            mongo::ScriptEngine::setup();
-            mongo::globalScriptEngine->setScopeInitCallback(mongo::shell_utils::initScope);
-            mongo::globalScriptEngine->enableJIT(true);
+            mongo::ScriptEngine::setup();            
+            mongo::getGlobalScriptEngine()->setScopeInitCallback(mongo::shell_utils::initScope);
+            mongo::getGlobalScriptEngine()->enableJIT(true);

-            mongo::Scope *scope = mongo::globalScriptEngine->newScope();
-            _scope = scope;
-            _engine = mongo::globalScriptEngine;
+            _scope.reset(mongo::getGlobalScriptEngine()->newScope());
+            _engine = mongo::getGlobalScriptEngine();

            // Load '.mongorc.js' from user's home directory
            if (isLoadMongoRcJs) {
                QString mongorcPath = QString("%1/.mongorc.js").arg(QDir::homePath());
                if (QFile::exists(mongorcPath)) {
-                    scope->execFile(QtUtils::toStdString(mongorcPath), false, false);
+                    _scope->execFile(QtUtils::toStdString(mongorcPath), false, false);
                }
            }

            // Load '.robomongorc.js'
            QString robomongorcPath = QString("%1/.robomongorc.js").arg(QDir::homePath());
            if (QFile::exists(robomongorcPath)) {
-                scope->execFile(QtUtils::toStdString(robomongorcPath), false, false);
+                _scope->execFile(QtUtils::toStdString(robomongorcPath), false, false);
            }
+            _failedScope = false;
        }

        // Esprima ECMAScript parser: http://esprima.org/
-        QFile file(":/robomongo/scripts/esprima.js");
-        if (!file.open(QIODevice::ReadOnly))
-            throw std::runtime_error("Unable to read esprima.js ");
+        std::string esprima = loadFile(":/robomongo/scripts/esprima.js", true);
+        _scope->exec(esprima, "(esprima)", false, true, true);

-        QTextStream in(&file);
-        QString esprima = in.readAll();
-
-        // Inject Esprima into Javascript scope
-        _scope->exec(QtUtils::toStdString(esprima), "(esprima)", true, true, true);
+        // UUID helpers
+        std::string uuidhelpers = loadFile(":/robomongo/scripts/uuidhelpers.js", true);
+        _scope->exec(uuidhelpers, "(uuidhelpers)", false, true, true);

        // Enable verbose shell reporting
        _scope->exec("_verboseShell = true;", "(verboseShell)", false, false, false);

        // Save original autocomplete function so it can be restored if overwritten by user preference
        _scope->exec("DB.autocompleteOriginal = DB.autocomplete;", "(saveOriginalAutocomplete)", false, false, false);
+
+        // Cache result of original "DB.autocomplete"
+        // Cache invalidated by the invalidateDbCollectionsCache() method.
+        std::string const cacheAutocompletion =
+            "__robomongoAutocompletionCache = null;"
+            "DB.autocompleteCached = function(obj) { "
+            "   if (__robomongoAutocompletionCache == null) {"
+            "       __robomongoAutocompletionCache = DB.autocompleteOriginal(obj);"
+            "   }"
+            "   return __robomongoAutocompletionCache;"
+            "}";
+
+        _scope->exec(cacheAutocompletion, "", false, false, false);
+
+        // Capture aggregate parameters: pipeline, options
+        std::string const aggregateInterceptor =
+            "__robomongoAggregateUsed = false;"
+            "__robomongoAggregate = DBCollection.prototype.aggregate;"
+            "__robomongoAggregatePipeline = null;"
+            "__robomongoAggregateOptions = null;"
+            "DBCollection.prototype.aggregate = function(pipeline, options) { "
+            "   __robomongoAggregateUsed = true;"
+            "   __robomongoAggregatePipeline = pipeline;"
+            "   __robomongoAggregateOptions = options;"
+            "   return __robomongoAggregate.call(this, pipeline, options);"
+            "}";
+
+        _scope->exec(aggregateInterceptor, "", false, false, false);
+
+        _initialized = true;
    }

-    MongoShellExecResult ScriptEngine::exec(const std::string &originalScript, const std::string &dbName)
+    MongoShellExecResult ScriptEngine::exec(const std::string &originalScript, const std::string &dbName, 
+                                            AggrInfo aggrInfo /* = AggrInfo() */)
    {
        QMutexLocker lock(&_mutex);

-        if(!_scope)
-            return MongoShellExecResult();
+        if (!_scope) {
+            _failedScope = true;
+            return MongoShellExecResult(true, "Connection error. Uninitialized mongo scope.");
+        }
+
+        // robomongo shell timeout
+        bool timeoutReached = false;

        /*
         * Replace all commands ('show dbs', 'use db' etc.) with call
@@ -177,7 +206,7 @@ namespace Robomongo

        use(dbName);

-        for(std::vector<std::string>::const_iterator it = statements.begin(); it != statements.end(); ++it)
+        for (std::vector<std::string>::const_iterator it = statements.begin(); it != statements.end(); ++it)
        {
            std::string statement = *it;
            // clear global objects
@@ -188,21 +217,34 @@ namespace Robomongo

            if (true /* ! wascmd */) {
                try {
+                    bool failed = false;
                    QElapsedTimer timer;
                    timer.start();
-                    if ( _scope->exec( statement , "(shell)" , false , true , false, 0 ) ) {
-                        _scope->exec( "__robomongoLastRes = __lastres__; shellPrintHelper( __lastres__ );" , "(shell2)" , true , true , false, 0);
+                    if ( _scope->exec( statement , "(shell)" , false , true , false, _timeoutSec * 1000) ) {
+                         _scope->exec( "__robomongoLastRes = __lastres__; shellPrintHelper( __lastres__ );", 
+                                      "(shell2)" , true , true , false, _timeoutSec * 1000);
                    }
+                    else   // failed to run script 
+                        failed = true;                               

-                    qint64 elapsed = timer.elapsed();
+                    qint64 elapsed = timer.elapsed();   // milliseconds 
+
+                    if (elapsed > _timeoutSec * 1000)
+                        timeoutReached = true;

                    std::string logs = __logs.str();
                    std::string answer = logs.c_str();
                    std::string type = __type.c_str();
+
+                    if (failed && !timeoutReached)
+                        return MongoShellExecResult(true, answer);
+
                    std::vector<MongoDocumentPtr> docs = MongoDocument::fromBsonObj(__objects);

                    if (!answer.empty() || docs.size() > 0)
-                        results.push_back(prepareResult(type, answer, docs, elapsed));
+                        results.push_back(
+                            prepareResult(type, answer, docs, elapsed, statement, aggrInfo)
+                        );
                }
                catch (const std::exception &e) {
                    std::cout << "error:" << e.what() << std::endl;
@@ -210,7 +252,7 @@ namespace Robomongo
            }
        }

-        return prepareExecResult(results);
+        return prepareExecResult(results, timeoutReached);
    }

    void ScriptEngine::interrupt()
@@ -251,8 +293,11 @@ namespace Robomongo

    void ScriptEngine::ping()
    {
+        if (!_scope)
+            return;
+
        QMutexLocker lock(&_mutex);
-        _scope->exec("if (db) { db.runCommand({ping:1}); }", "(ping)", false, false, false);
+        _scope->exec("if (db) { db.runCommand({ping:1}); }", "(ping)", false, false, false, 3000);
    }

    QStringList ScriptEngine::complete(const std::string &prefix, const AutocompletionMode mode)
@@ -262,7 +307,7 @@ namespace Robomongo

        try {
            if (mode == AutocompleteAll)
-                _scope->exec("DB.autocomplete = DB.autocompleteOriginal;", "", false, false, false);
+                _scope->exec("DB.autocomplete = DB.autocompleteCached;", "", false, false, false);
            else if (mode == AutocompleteNoCollectionNames)
                _scope->exec("DB.autocomplete = function(obj){return [];}", "", false, false, false);

@@ -289,14 +334,17 @@ namespace Robomongo
    }

    MongoShellResult ScriptEngine::prepareResult(const std::string &type, const std::string &output,
-                                                 const std::vector<MongoDocumentPtr> &objects, qint64 elapsedms)
+                                                 const std::vector<MongoDocumentPtr> &objects, qint64 elapsedms,
+                                                 const std::string &statement, AggrInfo aggrInfo /*= AggrInfo()*/)
    {
        const char *script =
            "__robomongoQuery = false; \n"
+            "__robomongoIsAggregate = false; \n"
            "__robomongoDbName = '[invalid database]'; \n"
            "__robomongoServerAddress = '[invalid connection]'; \n"
            "__robomongoCollectionName = '[invalid collection]'; \n"
-            "if (typeof __robomongoLastRes == 'object' && __robomongoLastRes != null && __robomongoLastRes instanceof DBQuery) { \n"
+            "if (typeof __robomongoLastRes == 'object' && __robomongoLastRes != null \n"
+            "    && __robomongoLastRes instanceof DBQuery) { \n"
            "    __robomongoQuery = true; \n"
            "    __robomongoDbName = __robomongoLastRes._db.getName();\n "
            "    __robomongoServerAddress = __robomongoLastRes._mongo.host; \n"
@@ -308,16 +356,27 @@ namespace Robomongo
            "    __robomongoBatchSize = __robomongoLastRes._batchSize; \n"
            "    __robomongoOptions = __robomongoLastRes._options; \n"
            "    __robomongoSpecial = __robomongoLastRes._special; \n"
-            "} \n";
+            "} \n"
+            "else if (typeof __robomongoLastRes == 'object' && __robomongoLastRes != null \n"
+            "         && __robomongoLastRes instanceof DBCommandCursor \n"
+            "         && __robomongoAggregateUsed) { \n"
+            "    __robomongoAggregateUsed = false; \n"    
+            "    __robomongoIsAggregate = true; \n"
+            "    __robomongoDbName = __robomongoLastRes._db.getName();\n "
+            "    __robomongoServerAddress = __robomongoLastRes._db._mongo.host; \n"
+            "    __robomongoCollectionName = __robomongoLastRes._collName; \n"
+            "} \n"
+            ;

        _scope->exec(script, "(getresultinfo)", false, false, false);
-
-        bool isQuery = _scope->getBoolean("__robomongoQuery");
+        bool const isQuery = _scope->getBoolean("__robomongoQuery");
+        bool const isAggregate = _scope->getBoolean("__robomongoIsAggregate");

        if (isQuery) {
            std::string serverAddress = getString("__robomongoServerAddress");
            std::string dbName = getString("__robomongoDbName");
            std::string collectionName = getString("__robomongoCollectionName");
+               
            mongo::BSONObj query = _scope->getObject("__robomongoQuery");
            mongo::BSONObj fields = _scope->getObject("__robomongoFields");

@@ -328,15 +387,32 @@ namespace Robomongo

            bool special = _scope->getBoolean("__robomongoSpecial");

-            MongoQueryInfo info = MongoQueryInfo(CollectionInfo(serverAddress, dbName, collectionName),
-                                       query, fields, limit, skip, batchSize, options, special);
-            return MongoShellResult(type, output, objects, info, elapsedms);
+            MongoQueryInfo const info{ CollectionInfo(serverAddress, dbName, collectionName),
+                                       query, fields, limit, skip, batchSize, options, special };
+            return MongoShellResult(type, output, objects, info, statement, elapsedms);
        }
+        else if (isAggregate) {
+            std::string const serverAddress = getString("__robomongoServerAddress");
+            std::string const dbName = getString("__robomongoDbName");
+            std::string const collectionName = getString("__robomongoCollectionName");
+            mongo::BSONObj const pipeline = _scope->getObject("__robomongoAggregatePipeline");
+            mongo::BSONObj const options = _scope->getObject("__robomongoAggregateOptions");

-        return MongoShellResult(type, output, objects, MongoQueryInfo(), elapsedms);
+            // This query can be paging of an original aggr. query, we store the original/unpaged 
+            // pipeline object here.
+            mongo::BSONObj const origPipeline = aggrInfo.isValid ? aggrInfo.pipeline : pipeline;
+            int const skip = aggrInfo.isValid ? aggrInfo.skip : 0;
+            int const batchSize = aggrInfo.isValid ? aggrInfo.batchSize : 50;
+            int const resultIndex = aggrInfo.isValid ? aggrInfo.resultIndex : -1;
+
+            AggrInfo const newAggrInfo { collectionName, skip, batchSize, origPipeline, options, resultIndex };
+            return MongoShellResult(type, output, objects, MongoQueryInfo(), statement, elapsedms, newAggrInfo);
+        }
+        return MongoShellResult(type, output, objects, MongoQueryInfo(), statement, elapsedms);
    }

-    MongoShellExecResult ScriptEngine::prepareExecResult(const std::vector<MongoShellResult> &results)
+    MongoShellExecResult ScriptEngine::prepareExecResult(const std::vector<MongoShellResult> &results, 
+                                                         bool timeoutReached /* = false */)
    {
        const char *script =
            "__robomongoServerAddress = '[invalid connection]'; \n"
@@ -358,7 +434,7 @@ namespace Robomongo
        std::string dbName = getString("__robomongoDbName");
        bool dbIsValid = _scope->getBoolean("__robomongoDbIsValid");

-        return MongoShellExecResult(results, serverName, serverIsValid, dbName, dbIsValid);
+        return MongoShellExecResult(results, serverName, serverIsValid, dbName, dbIsValid, timeoutReached);
    }

    std::string ScriptEngine::getString(const char *fieldName)
@@ -413,4 +489,26 @@ namespace Robomongo

        return true;
    }
+
+    void ScriptEngine::invalidateDbCollectionsCache() {
+        if (!_initialized)
+            return;
+
+        _scope->exec("__robomongoAutocompletionCache = null;", "", false, false, false);
+    }
+
+    std::string ScriptEngine::loadFile(const QString &path, bool throwOnError) {
+        QFile file(path);
+        if (!file.open(QIODevice::ReadOnly)) {
+            if (throwOnError)
+                throw std::runtime_error("Unable to load file");
+
+            return "";
+        }
+
+        QTextStream in(&file);
+        QString content = in.readAll();
+        return QtUtils::toStdString(content);
+    }
 }
+
@@ -15,11 +15,12 @@ namespace Robomongo
    {

    public:
-        ScriptEngine(ConnectionSettings *connection);
+        ScriptEngine(ConnectionSettings *connection, int timeoutSec);
        ~ScriptEngine();

-        void init(bool isLoadMongoJs);
-        MongoShellExecResult exec(const std::string &script, const std::string &dbName = std::string());
+        void init(bool isLoadMongoJs, const std::string& serverAddr = "", const std::string& dbName = "");
+        MongoShellExecResult exec(const std::string &script, const std::string &dbName = std::string(),
+                                  AggrInfo aggrInfo = AggrInfo());
        void interrupt();

        void use(const std::string &dbName);
@@ -27,20 +28,31 @@ namespace Robomongo
        void ping();
        QStringList complete(const std::string &prefix, const AutocompletionMode mode);

+        void invalidateDbCollectionsCache();
+
+        bool failedScope() const { return _failedScope; }
+
+        void changeTimeout(int newTimeout) { _timeoutSec = newTimeout; }
+
    private:
        ConnectionSettings *_connection;

-        MongoShellResult prepareResult(const std::string &type, const std::string &output, const std::vector<MongoDocumentPtr> &objects, qint64 elapsedms);
-        MongoShellExecResult prepareExecResult(const std::vector<MongoShellResult> &results);
+        MongoShellResult prepareResult(const std::string &type, const std::string &output, 
+                                       const std::vector<MongoDocumentPtr> &objects, qint64 elapsedms,
+                                       const std::string &statement, AggrInfo aggrInfo = AggrInfo());

+        MongoShellExecResult prepareExecResult(const std::vector<MongoShellResult> &results, 
+                                               bool timeoutReached = false);
+
+        std::string loadFile(const QString &path, bool throwOnError);
        std::string getString(const char *fieldName);
-
        bool statementize(const std::string &script, std::vector<std::string> &outList, std::string &outError);
-        std::vector<std::string> statementize2(const std::string &script);
-//        void parseTree(JSParseNode * root, int indent, const std::string &script, std::vector<std::string> &list, bool topList);

+        int _timeoutSec;
        mongo::ScriptEngine *_engine;
-        mongo::Scope *_scope;
+        std::unique_ptr<mongo::Scope> _scope;
+        bool _failedScope = false;
        QMutex _mutex;
+        bool _initialized;
    };
 }
@@ -5,6 +5,11 @@ namespace Robomongo
 {
    R_REGISTER_EVENT(EstablishConnectionRequest)
    R_REGISTER_EVENT(EstablishConnectionResponse)
+    R_REGISTER_EVENT(ReplicaSetRefreshed)
+    R_REGISTER_EVENT(RefreshReplicaSetFolderRequest)
+    R_REGISTER_EVENT(RefreshReplicaSetFolderResponse)
+    R_REGISTER_EVENT(ReplicaSetFolderLoading)
+    R_REGISTER_EVENT(ReplicaSetFolderRefreshed)
    R_REGISTER_EVENT(LoadDatabaseNamesRequest)
    R_REGISTER_EVENT(LoadDatabaseNamesResponse)
    R_REGISTER_EVENT(LoadCollectionNamesRequest)
@@ -66,4 +71,5 @@ namespace Robomongo
    R_REGISTER_EVENT(ListenSshConnectionResponse)
    R_REGISTER_EVENT(LogEvent)
    R_REGISTER_EVENT(StopScriptRequest)
+    R_REGISTER_EVENT(OperationFailedEvent)
 }
@@ -10,8 +10,10 @@
 #include "robomongo/core/domain/MongoUser.h"
 #include "robomongo/core/domain/MongoFunction.h"
 #include "robomongo/core/events/MongoEventsInfo.h"
+#include "robomongo/core/domain/MongoAggregateInfo.h"
 #include "robomongo/core/Event.h"
 #include "robomongo/core/Enums.h"
+#include "robomongo/core/mongodb/ReplicaSet.h"

 namespace Robomongo
 {
@@ -26,32 +28,119 @@ namespace Robomongo
     * @brief EstablishConnection
     */

-    class EstablishConnectionRequest : public Event
+    struct EstablishConnectionRequest : public Event
    {
        R_EVENT

-        EstablishConnectionRequest(QObject *sender) :
+            EstablishConnectionRequest(QObject *sender, ConnectionType connectionType, std::string const& uuid) :
+            Event(sender),
+            connectionType(connectionType),
+            uuid(uuid) {}
+
+        ConnectionType const connectionType;
+        std::string const uuid;
+    };
+
+    struct EstablishConnectionResponse : public Event
+    {
+        R_EVENT
+
+        enum ErrorReason {
+            NoError             = 0,
+            MongoConnection     = 1,
+            MongoAuth           = 2,
+            MongoSslConnection  = 3
+        };
+
+        EstablishConnectionResponse(QObject *sender, const ConnectionInfo &info, ConnectionType connectionType, 
+                                    const ReplicaSet& replicaSet) :
+            Event(sender),
+            info(info),
+            connectionType(connectionType),
+            replicaSet(replicaSet)
+            {}
+
+        EstablishConnectionResponse(QObject *sender, const EventError &error, ConnectionType connectionType, 
+                                    ConnectionInfo const& info, const ReplicaSet& replicaSet, ErrorReason errorReason) :
+            Event(sender, error),
+            info(info),
+            connectionType(connectionType),
+            errorReason(errorReason),
+            replicaSet(replicaSet)
+        {}
+
+        ConnectionInfo const info;
+        ConnectionType const connectionType;
+        ErrorReason const errorReason = NoError;
+        ReplicaSet const replicaSet;
+    };
+
+    struct ReplicaSetRefreshed : public Event
+    {
+        R_EVENT
+
+        ReplicaSetRefreshed(QObject *sender) :
+            Event(sender) {}
+
+        ReplicaSetRefreshed(QObject *sender, const EventError &error, ReplicaSet const& replicaSet) :
+            Event(sender, error), replicaSet(replicaSet) {}
+
+        ReplicaSet const replicaSet;
+    };
+
+    struct RefreshReplicaSetFolderRequest : public Event
+    {
+        R_EVENT
+
+        RefreshReplicaSetFolderRequest(QObject *sender, bool expanded) :
+            Event(sender), expanded(expanded) {}
+
+        bool const expanded = false;
+    };
+
+    struct RefreshReplicaSetFolderResponse : public Event
+    {
+        R_EVENT
+
+        // Primary is reachable
+        RefreshReplicaSetFolderResponse(QObject *sender, ReplicaSet const& replicaSet, bool expanded) :
+            Event(sender), replicaSet(replicaSet), expanded(expanded) {}
+        
+        // Primary is unreachable, secondary(ies) might be reachable
+        RefreshReplicaSetFolderResponse(QObject *sender, ReplicaSet const&  replicaSet, bool expanded,
+                                        const EventError &error) :
+            Event(sender, error), replicaSet(replicaSet), expanded(expanded) {}
+
+        ReplicaSet const replicaSet;
+        bool const expanded = false;
+    };
+
+    struct ReplicaSetFolderLoading : public Event
+    {
+        R_EVENT
+
+            ReplicaSetFolderLoading(QObject *sender) :
            Event(sender) {}
    };

-    class EstablishConnectionResponse : public Event
+    struct ReplicaSetFolderRefreshed : public Event
    {
        R_EVENT

-        EstablishConnectionResponse(QObject *sender, const ConnectionInfo &info) :
-            Event(sender),
-            _info(info) {}
+        ReplicaSetFolderRefreshed(QObject *sender, bool expanded) :
+            Event(sender), expanded(expanded) {}

-        EstablishConnectionResponse(QObject *sender, const EventError &error) :
-            Event(sender, error),_info() {}
+        ReplicaSetFolderRefreshed(QObject *sender, const EventError &error, bool expanded) :
+            Event(sender, error), expanded(expanded) {}

-        const ConnectionInfo &info() const{
-            return _info;
-        }
-        const ConnectionInfo _info;
+        ReplicaSetFolderRefreshed(QObject *sender, const EventError &error, ReplicaSet const& replicaSet,
+                                  bool expanded) :
+            Event(sender, error), replicaSet(replicaSet), expanded(expanded) {}
+
+        ReplicaSet const replicaSet;
+        bool const expanded = false;
    };

-
    /**
     * @brief LoadDatabaseNames
     */
@@ -109,7 +198,7 @@ namespace Robomongo
            _databaseName(databaseName),
            _collectionInfos(collectionInfos) { }

-        LoadCollectionNamesResponse(QObject *sender,const EventError &error) :
+        LoadCollectionNamesResponse(QObject *sender, const EventError &error) :
            Event(sender, error) {}

        std::string databaseName() const { return _databaseName; }
@@ -125,7 +214,7 @@ namespace Robomongo
        R_EVENT
    public:
        LoadCollectionIndexesRequest(QObject *sender, const MongoCollectionInfo &collection) :
-        Event(sender),_collection(collection) {}
+        Event(sender), _collection(collection) {}
        MongoCollectionInfo collection() const { return _collection; }
    private:
        const MongoCollectionInfo _collection;
@@ -148,7 +237,7 @@ namespace Robomongo
    class EnsureIndexRequest : public Event
    {
        R_EVENT
-        EnsureIndexRequest(QObject *sender,const EnsureIndexInfo &oldInfo,const EnsureIndexInfo &newInfo) : Robomongo::Event(sender),oldInfo_(oldInfo),newInfo_(newInfo) {}
+        EnsureIndexRequest(QObject *sender, const EnsureIndexInfo &oldInfo, const EnsureIndexInfo &newInfo) : Robomongo::Event(sender), oldInfo_(oldInfo), newInfo_(newInfo) {}
        const EnsureIndexInfo &oldInfo() const
        {
            return oldInfo_;
@@ -172,7 +261,7 @@ namespace Robomongo
            _name(name) {}

        MongoCollectionInfo collection() const { return _collection; }
-        std::string name() const {return _name;}
+        std::string name() const { return _name; }
    private:
        const MongoCollectionInfo _collection;
        std::string _name;
@@ -182,14 +271,14 @@ namespace Robomongo
    {
        R_EVENT
    public:
-        DeleteCollectionIndexResponse(QObject *sender, const MongoCollectionInfo &collection,const std::string &index) :
-            Event(sender),_collection(collection),_index(index) {}
+        DeleteCollectionIndexResponse(QObject *sender, const MongoCollectionInfo &collection, const std::string &index) :
+            Event(sender), _collection(collection), _index(index) {}

        DeleteCollectionIndexResponse(QObject *sender, const EventError &error) :
            Event(sender, error) {}

        MongoCollectionInfo collection() const { return _collection; }
-        std::string index() const {return _index;}
+        std::string index() const { return _index; }
    private:
        MongoCollectionInfo _collection;
        std::string _index;
@@ -199,11 +288,11 @@ namespace Robomongo
    {
        R_EVENT
    public:
-        EditIndexRequest(QObject *sender, const MongoCollectionInfo &collection,const std::string &oldIndex,const std::string &newIndex) :
-            Event(sender),_collection(collection),_oldIndex(oldIndex),_newIndex(newIndex) {}
+        EditIndexRequest(QObject *sender, const MongoCollectionInfo &collection, const std::string &oldIndex, const std::string &newIndex) :
+            Event(sender), _collection(collection), _oldIndex(oldIndex), _newIndex(newIndex) {}
        MongoCollectionInfo collection() const { return _collection; }
-        std::string oldIndex() const {return _oldIndex;}
-        std::string newIndex() const {return _newIndex;}
+        std::string oldIndex() const { return _oldIndex; }
+        std::string newIndex() const { return _newIndex; }
    private:
        const MongoCollectionInfo _collection;
        std::string _oldIndex;
@@ -240,7 +329,7 @@ namespace Robomongo
            _databaseName(databaseName),
            _users(users) { }

-        LoadUsersResponse(QObject *sender,const EventError &error) :
+        LoadUsersResponse(QObject *sender, const EventError &error) :
            Event(sender, error) {}

        std::string databaseName() const { return _databaseName; }
@@ -282,7 +371,7 @@ namespace Robomongo
            _databaseName(databaseName),
            _functions(functions) { }

-        LoadFunctionsResponse(QObject *sender,const EventError &error) :
+        LoadFunctionsResponse(QObject *sender, const EventError &error) :
            Event(sender, error) {}

        std::string databaseName() const { return _databaseName; }
@@ -326,7 +415,7 @@ namespace Robomongo
        InsertDocumentResponse(QObject *sender) :
            Event(sender) {}

-        InsertDocumentResponse(QObject *sender, const EventError &error) :
+        InsertDocumentResponse(QObject *sender, EventError const& error) :
            Event(sender, error) {}
    };

@@ -334,37 +423,46 @@ namespace Robomongo
     * @brief Remove Document
     */

+    enum class RemoveDocumentCount { ONE, MULTI, ALL };
+
    class RemoveDocumentRequest : public Event
    {
        R_EVENT

    public:
-        RemoveDocumentRequest(QObject *sender, mongo::Query query, const MongoNamespace &ns, bool justOne = true) :
+        RemoveDocumentRequest(QObject *sender, mongo::Query query, const MongoNamespace &ns, 
+                              RemoveDocumentCount removeCount, int index) :
            Event(sender),
            _query(query),
            _ns(ns),
-            _justOne(justOne) {}
+            _removeCount(removeCount),
+            _index(index) {}

        mongo::Query query() const { return _query; }
        MongoNamespace ns() const { return _ns; }
-        bool justOne() const { return _justOne; }
+        RemoveDocumentCount removeCount() const { return _removeCount; }
+        int index() const { return _index; }

    private:
-        mongo::Query _query;
-        const MongoNamespace _ns;
-        bool _justOne;
+        mongo::Query const _query;
+        MongoNamespace const _ns;
+        RemoveDocumentCount const _removeCount;
+        // if this is a multi remove, this is the index of current document deleted. 0 for first document.
+        int const _index;     
    };

-    class RemoveDocumentResponse : public Event
+    struct RemoveDocumentResponse : public Event
    {
        R_EVENT

-    public:
-        RemoveDocumentResponse(QObject *sender) :
-            Event(sender) {}
+        RemoveDocumentResponse(QObject *sender, RemoveDocumentCount removeCount, int index) :
+            Event(sender), removeCount(removeCount), index(index) {}

-        RemoveDocumentResponse(QObject *sender, const EventError &error) :
-            Event(sender, error) {}
+        RemoveDocumentResponse(QObject *sender, const EventError &error, RemoveDocumentCount removeCount, int index) :
+            Event(sender, error), removeCount(removeCount), index(index) {}
+
+        RemoveDocumentCount const removeCount;
+        int const index;
    };

    /**
@@ -383,52 +481,49 @@ namespace Robomongo
        std::string database() const { return _database; }

    private:
-        std::string _database;
+        std::string const _database;
    };

-    class CreateDatabaseResponse : public Event
+    struct CreateDatabaseResponse : public Event
    {
        R_EVENT

-    public:
-        CreateDatabaseResponse(QObject *sender) :
-            Event(sender) {}
+        CreateDatabaseResponse(QObject *sender, const std::string &database) :
+            Event(sender), database(database) {}

-        CreateDatabaseResponse(QObject *sender, const EventError &error) :
-            Event(sender, error) {}
+        CreateDatabaseResponse(QObject *sender, const std::string &database, const EventError &error) :
+            Event(sender, error), database(database) {}
+
+        std::string const database;
    };


-
    /**
     * @brief Drop Database
     */

-    class DropDatabaseRequest : public Event
+    struct DropDatabaseRequest : public Event
    {
        R_EVENT

-    public:
        DropDatabaseRequest(QObject *sender, const std::string &database) :
-            Event(sender),
-            _database(database) {}
+            Event(sender), database(database) {}

-        std::string database() const { return _database; }
-
-    private:
-        std::string _database;
+        std::string const database;
    };

-    class DropDatabaseResponse : public Event
+    struct DropDatabaseResponse : public Event
    {
        R_EVENT

    public:
-        DropDatabaseResponse(QObject *sender) :
-            Event(sender) {}
+        DropDatabaseResponse(QObject *sender, const std::string &database) :
+            Event(sender), database(database) {}

-        DropDatabaseResponse(QObject *sender, const EventError &error) :
-            Event(sender, error) {}
+        DropDatabaseResponse(QObject *sender, const std::string &database, const EventError &error) :
+            Event(sender, error), database(database) {}
+
+        std::string const database;
    };

    /**
@@ -440,26 +535,40 @@ namespace Robomongo
        R_EVENT

    public:
-        CreateCollectionRequest(QObject *sender, const MongoNamespace &ns) :
-            Event(sender),
-            _ns(ns) {}
+        CreateCollectionRequest(QObject *sender, const MongoNamespace &ns, 
+                                                 const mongo::BSONObj& extraOptions,
+                                                 long long size = 0,
+                                                 bool capped = false,
+                                                 int maxDocNum = 0
+                                                 ) :
+            Event(sender), _ns(ns), _extraOptions(extraOptions),
+            _size(size), _capped(capped), _maxDocNum(maxDocNum) {}

        MongoNamespace ns() const { return _ns; }
+        long long getSize() const { return _size; }
+        bool getCapped() const { return _capped; }
+        int getMaxDocNum() const { return _maxDocNum; }
+        const mongo::BSONObj getExtraOptions() const { return _extraOptions; }

    private:
-        const MongoNamespace _ns;
+        MongoNamespace const _ns;
+        long long const _size;
+        bool const _capped;
+        int const _maxDocNum;
+        mongo::BSONObj const _extraOptions;
    };

-    class CreateCollectionResponse : public Event
+    struct CreateCollectionResponse : public Event
    {
        R_EVENT

-    public:
-        CreateCollectionResponse(QObject *sender) :
-            Event(sender) {}
+        CreateCollectionResponse(QObject *sender, std::string const& collection) :
+        Event(sender), collection(collection) {}

-        CreateCollectionResponse(QObject *sender, const EventError &error) :
-            Event(sender, error) {}
+        CreateCollectionResponse(QObject *sender, std::string const& collection, const EventError &error) :
+            Event(sender, error), collection(collection) {}
+
+        std::string const collection;
    };


@@ -483,16 +592,18 @@ namespace Robomongo
        MongoNamespace _ns;
    };

-    class DropCollectionResponse : public Event
+    struct DropCollectionResponse : public Event
    {
        R_EVENT

    public:
-        DropCollectionResponse(QObject *sender) :
-            Event(sender) {}
+        DropCollectionResponse(QObject *sender, std::string const& collection) :
+            Event(sender), collection(collection) {}

-        DropCollectionResponse(QObject *sender, const EventError &error) :
-            Event(sender, error) {}
+        DropCollectionResponse(QObject *sender, std::string const& collection, const EventError &error) :
+            Event(sender, error), collection(collection) {}
+
+        std::string const collection;
    };

    /**
@@ -513,20 +624,23 @@ namespace Robomongo
        std::string newCollection() const { return _newCollection; }

    private:
-        MongoNamespace _ns;
-        std::string _newCollection;
+        MongoNamespace const _ns;
+        std::string const _newCollection;
    };

-    class RenameCollectionResponse : public Event
+    struct RenameCollectionResponse : public Event
    {
        R_EVENT

-    public:
-        RenameCollectionResponse(QObject *sender) :
-            Event(sender) {}
+            RenameCollectionResponse(QObject *sender, std::string const& oldCollection, 
+                                     std::string const& newCollection) :
+            Event(sender), oldCollection(oldCollection), newCollection(newCollection) {}

        RenameCollectionResponse(QObject *sender, const EventError &error) :
            Event(sender, error) {}
+
+        std::string const oldCollection;
+        std::string const newCollection;
    };

    /**
@@ -547,20 +661,24 @@ namespace Robomongo
        std::string newCollection() const { return _newCollection; }

    private:
-        MongoNamespace _ns;
-        std::string _newCollection;
+        MongoNamespace const _ns;
+        std::string const _newCollection;
    };

-    class DuplicateCollectionResponse : public Event
+    struct DuplicateCollectionResponse : public Event
    {
        R_EVENT

    public:
-        DuplicateCollectionResponse(QObject *sender) :
-            Event(sender) {}
+        DuplicateCollectionResponse(QObject *sender, std::string const& sourceCollection,
+                                    std::string const& duplicateCollection) :
+            Event(sender), sourceCollection(sourceCollection), duplicateCollection(duplicateCollection) {}

-        DuplicateCollectionResponse(QObject *sender, const EventError &error) :
-            Event(sender, error) {}
+        DuplicateCollectionResponse(QObject *sender, std::string const& sourceCollection, const EventError &error) :
+            Event(sender, error), sourceCollection(sourceCollection) {}
+
+        std::string const sourceCollection;
+        std::string const duplicateCollection;
    };

     /**
@@ -580,7 +698,7 @@ namespace Robomongo
            _to(databaseTo, collection) {}

        MongoWorker *worker() const { return _worker; }
-        MongoNamespace from() const { return _from;}
+        MongoNamespace from() const { return _from; }
        MongoNamespace to() const { return _to; }
    private:
        MongoWorker *_worker;
@@ -609,32 +727,30 @@ namespace Robomongo
        R_EVENT

    public:
-        CreateUserRequest(QObject *sender, const std::string &database, const MongoUser &user, bool overwrite = false) :
+        CreateUserRequest(QObject *sender, const std::string &database, const MongoUser &user) :
            Event(sender),
            _database(database),
-            _user(user),
-            _overwrite(overwrite) {}
+            _user(user) {}

        std::string database() const { return _database; }
        MongoUser user() const { return _user; }
-        bool overwrite() const { return _overwrite; }

    private:
        std::string _database;
        MongoUser _user;
-        bool _overwrite;
    };

-    class CreateUserResponse : public Event
+    struct CreateUserResponse : public Event
    {
        R_EVENT

-    public:
-        CreateUserResponse(QObject *sender) :
-            Event(sender) {}
+        CreateUserResponse(QObject *sender, std::string const& userName) :
+            Event(sender), userName(userName) {}

-        CreateUserResponse(QObject *sender, const EventError &error) :
-            Event(sender, error) {}
+        CreateUserResponse(QObject *sender, std::string const& userName, const EventError &error) :
+            Event(sender, error), userName(userName) {}
+
+        std::string const userName;
    };


@@ -647,29 +763,28 @@ namespace Robomongo
        R_EVENT

    public:
-        DropUserRequest(QObject *sender, const std::string &database, const mongo::OID &id) :
-            Event(sender),
-            _database(database),
-            _id(id) {}
+        DropUserRequest(QObject *sender, const std::string &database, std::string const& username) :
+            Event(sender), _database(database), _username(username) {}

        std::string database() const { return _database; }
-        mongo::OID id() const { return _id; }
+        std::string username() const { return _username; }

    private:
        std::string _database;
-        mongo::OID _id;
+        std::string const _username;
    };

-    class DropUserResponse : public Event
+    struct DropUserResponse : public Event
    {
        R_EVENT

-    public:
-        DropUserResponse(QObject *sender) :
-            Event(sender) {}
+        DropUserResponse(QObject *sender, std::string const& username) :
+            Event(sender), username(username) {}

-        DropUserResponse(QObject *sender, const EventError &error) :
-            Event(sender, error) {}
+        DropUserResponse(QObject *sender, std::string const& username, const EventError &error) :
+            Event(sender, error), username(username) {}
+
+        std::string const username;
    };


@@ -682,39 +797,45 @@ namespace Robomongo
        R_EVENT

    public:
-        CreateFunctionRequest(QObject *sender, const std::string &database, const MongoFunction &function,
-                              const std::string &existingFunctionName = std::string(), bool overwrite = false) :
+        CreateFunctionRequest(QObject *sender, const std::string &database, float dbVersion, 
+                              const MongoFunction &function, const std::string &existingFunctionName = std::string(), 
+                              bool overwrite = false) :
            Event(sender),
            _database(database),
+            _dbVersion(dbVersion),
            _existingFunctionName(existingFunctionName),
            _function(function),
            _overwrite(overwrite) {}

        std::string database() const { return _database; }
+        float dbVersion() const { return _dbVersion; }
        std::string existingFunctionName() const { return _existingFunctionName; }
        MongoFunction function() const { return _function; }
        bool overwrite() const { return _overwrite; }

    private:
        std::string _database;
+        float const _dbVersion = 0.0f;
        std::string _existingFunctionName;
        MongoFunction _function;
        bool _overwrite;
    };

-    class CreateFunctionResponse : public Event
+    struct CreateFunctionResponse : public Event
    {
        R_EVENT
+        
+        enum Operation { NewFunction, NameUpdate, CodeUpdate }; // todo

-    public:
-        CreateFunctionResponse(QObject *sender) :
-            Event(sender) {}
+        CreateFunctionResponse(QObject *sender, std::string const& functionName) :
+            Event(sender), functionName(functionName) {}

-        CreateFunctionResponse(QObject *sender, const EventError &error) :
-            Event(sender, error) {}
+        CreateFunctionResponse(QObject *sender, std::string const& functionName, const EventError &error) :
+            Event(sender, error), functionName(functionName) {}
+
+        std::string const functionName;
    };

-
    /**
     * @brief Drop Function
     */
@@ -724,29 +845,34 @@ namespace Robomongo
        R_EVENT

    public:
-        DropFunctionRequest(QObject *sender, const std::string &database, const std::string &name) :
+        DropFunctionRequest(QObject *sender, const std::string &database, float dbVersion, 
+                            const std::string &funcName) :
            Event(sender),
            _database(database),
-            _name(name) {}
+            _dbVersion(dbVersion),
+            _functionName(funcName) {}

        std::string database() const { return _database; }
-        std::string name() const { return _name; }
+        float dbVersion() const { return _dbVersion; }
+        std::string functionName() const { return _functionName; }

    private:
        std::string _database;
-        std::string _name;
+        float const _dbVersion = 0.0f;
+        std::string _functionName;
    };

-    class DropFunctionResponse : public Event
+    struct DropFunctionResponse : public Event
    {
        R_EVENT

-    public:
-        DropFunctionResponse(QObject *sender) :
-            Event(sender) {}
+        DropFunctionResponse(QObject *sender, const std::string &functionName) :
+        Event(sender), functionName(functionName) {}

-        DropFunctionResponse(QObject *sender, const EventError &error) :
-            Event(sender, error) {}
+        DropFunctionResponse(QObject *sender, const std::string &functionName, const EventError &error) :
+            Event(sender, error), functionName(functionName) {}
+
+        std::string const functionName;
    };

    /**
@@ -806,7 +932,7 @@ namespace Robomongo
    {
        R_EVENT

-        AutocompleteResponse(QObject *sender,const QStringList &list, const std::string &prefix) :
+        AutocompleteResponse(QObject *sender, const QStringList &list, const std::string &prefix) :
            Event(sender),
            list(list),
            prefix(prefix) {}
@@ -827,33 +953,39 @@ namespace Robomongo
    {
        R_EVENT

-        ExecuteScriptRequest(QObject *sender, const std::string &script, const std::string &dbName, int take = 0, int skip = 0) :
+        ExecuteScriptRequest(QObject *sender, const std::string &script, const std::string &dbName, 
+                             AggrInfo aggrInfo = AggrInfo(), int take = 0, int skip = 0) :
            Event(sender),
            script(script),
            databaseName(dbName),
+            aggrInfo(aggrInfo),
            take(take),
-            skip(skip) {}
+            skip(skip)
+            {}

        std::string script;
        std::string databaseName;
        int take; //
        int skip;
+        AggrInfo const aggrInfo;
    };

    class ExecuteScriptResponse : public Event
    {
        R_EVENT

-        ExecuteScriptResponse(QObject *sender, const MongoShellExecResult &result, bool empty) :
-            Event(sender),
-            result(result),
-            empty(empty) { }
+        ExecuteScriptResponse(QObject *sender, const MongoShellExecResult &result, bool empty,
+                              bool timeoutReached = false) :
+            Event(sender), result(result), empty(empty), _timeoutReached(timeoutReached) {}

-        ExecuteScriptResponse(QObject *sender, const EventError &error) :
-            Event(sender, error) {}
+        ExecuteScriptResponse(QObject *sender, const EventError &error, bool timeoutReached = false) :
+            Event(sender, error), _timeoutReached(timeoutReached) {}
+
+        bool timeoutReached() const { return _timeoutReached; }

        MongoShellExecResult result;
        bool empty;
+        bool const _timeoutReached = false;
    };

    class ConnectingEvent : public Event
@@ -879,27 +1011,43 @@ namespace Robomongo
    {
        R_EVENT

-        ConnectionFailedEvent(QObject *sender, const std::string& message) :
-            Event(sender),
-            message(message) {}
+        enum Reason {
+            MongoConnection    = 1,
+            MongoAuth          = 2,
+            SshConnection      = 3,
+            SshChannel         = 4,
+            SslConnection      = 5
+        };

-        ConnectionFailedEvent(QObject *sender, const EventError &error) :
-            Event(sender, error) {}
+        ConnectionFailedEvent(QObject *sender, int serverHandle, ConnectionType connectionType,
+                              const std::string& message, Reason reason) :
+            Event(sender),
+            message(message),
+            reason(reason),
+            serverHandle(serverHandle),
+            connectionType(connectionType) {}

        std::string message;
+        Reason reason;
+        ConnectionType connectionType;
+        int serverHandle;
    };

 //    class ScriptExecute

-    class ConnectionEstablishedEvent : public Event
+    struct ConnectionEstablishedEvent : public Event
    {
        R_EVENT

-        ConnectionEstablishedEvent(MongoServer *server) :
+        ConnectionEstablishedEvent(MongoServer *server, ConnectionType type, ConnectionInfo connInfo) :
            Event((QObject *)server),
-            server(server) { }
+            server(server),
+            connectionType(type),
+            connInfo(connInfo) { }       

        MongoServer *server;
+        ConnectionType const connectionType;
+        ConnectionInfo const connInfo;
    };

    class DatabaseListLoadedEvent : public Event
@@ -948,20 +1096,21 @@ namespace Robomongo
        R_EVENT

    public:
-        ScriptExecutedEvent(QObject *sender, const MongoShellExecResult &result, bool empty) :
-            Event(sender),
-            _result(result),
-            _empty(empty) { }
+        ScriptExecutedEvent(QObject *sender, const MongoShellExecResult &result, bool empty,
+                            bool timeoutReached = false) :
+            Event(sender), _result(result), _empty(empty), _timeoutReached(timeoutReached) {}

-        ScriptExecutedEvent(QObject *sender, const EventError &error) :
-            Event(sender, error) {}
+        ScriptExecutedEvent(QObject *sender, const EventError &error, bool timeoutReached = false) :
+            Event(sender, error), _timeoutReached(timeoutReached) {}

        MongoShellExecResult result() const { return _result; }
        bool empty() const { return _empty; }
+        bool timeoutReached() const { return _timeoutReached; }

    private:
        MongoShellExecResult _result;
        bool _empty;
+        bool const _timeoutReached = false;
    };

    class ScriptExecutingEvent : public Event
@@ -973,6 +1122,20 @@ namespace Robomongo
            Event(sender) { }
    };

+    class OperationFailedEvent : public Event
+    {
+        R_EVENT
+
+    public:
+        OperationFailedEvent(QObject *sender, const std::string &technicalErrorMessage, const std::string &userFriendlyErrorMessage) :
+            technicalErrorMessage(technicalErrorMessage),
+            userFriendlyErrorMessage(userFriendlyErrorMessage),
+            Event(sender) { }
+
+        std::string technicalErrorMessage;
+        std::string userFriendlyErrorMessage;
+    };
+
    class QueryWidgetUpdatedEvent : public Event
    {
        R_EVENT
@@ -996,38 +1159,43 @@ namespace Robomongo
    {
    R_EVENT

-        EstablishSshConnectionRequest(QObject *sender, SshTunnelWorker* worker, ConnectionSettings* settings, bool visible) :
+        EstablishSshConnectionRequest(QObject *sender, int serverHandle, SshTunnelWorker* worker, ConnectionSettings* settings, ConnectionType connectionType) :
            Event(sender),
            worker(worker),
            settings(settings),
-            visible(visible) {}
+            serverHandle(serverHandle),
+            connectionType(connectionType) {}

        ConnectionSettings* settings;
-        bool visible;
+        ConnectionType connectionType;
        SshTunnelWorker* worker;
+        int serverHandle;
    };

    class EstablishSshConnectionResponse : public Event
    {
    R_EVENT

-        EstablishSshConnectionResponse(QObject *sender, SshTunnelWorker* worker, ConnectionSettings* settings, bool visible, int localport) :
+        EstablishSshConnectionResponse(QObject *sender, int serverHandle, SshTunnelWorker* worker, ConnectionSettings* settings, ConnectionType connectionType, int localport) :
            Event(sender),
            worker(worker),
            settings(settings),
-            visible(visible),
+            connectionType(connectionType),
+            serverHandle(serverHandle),
            localport(localport) {}

-        EstablishSshConnectionResponse(QObject *sender, const EventError &error, SshTunnelWorker* worker, ConnectionSettings* settings, bool visible) :
+        EstablishSshConnectionResponse(QObject *sender, int serverHandle, const EventError &error, SshTunnelWorker* worker, ConnectionSettings* settings, ConnectionType connectionType) :
            Event(sender, error),
            worker(worker),
            settings(settings),
-            visible(visible) {}
+            serverHandle(serverHandle),
+            connectionType(connectionType) {}

        ConnectionSettings* settings;
-        bool visible;
+        ConnectionType connectionType;
        SshTunnelWorker* worker;
        int localport;
+        int serverHandle;
    };

    /**
@@ -1038,23 +1206,34 @@ namespace Robomongo
    {
    R_EVENT

-        ListenSshConnectionRequest(QObject *sender) :
-                Event(sender) {}
+        ListenSshConnectionRequest(QObject *sender, int serverHandle, ConnectionType connectionType) :
+            Event(sender),
+            serverHandle(serverHandle),
+            connectionType(connectionType) {}
+
+        ConnectionType connectionType;
+        int serverHandle;
    };

    class ListenSshConnectionResponse : public Event
    {
    R_EVENT

-        ListenSshConnectionResponse(QObject *sender, ConnectionSettings* settings) :
+        ListenSshConnectionResponse(QObject *sender, int serverHandle, ConnectionSettings* settings, ConnectionType connectionType) :
            Event(sender),
-            settings(settings) {}
+            settings(settings),
+            serverHandle(serverHandle),
+            connectionType(connectionType) {}

-        ListenSshConnectionResponse(QObject *sender, const EventError &error, ConnectionSettings* settings) :
+        ListenSshConnectionResponse(QObject *sender, const EventError &error, int serverHandle, ConnectionSettings* settings, ConnectionType connectionType) :
            Event(sender, error),
-            settings(settings) {}
+            settings(settings),
+            serverHandle(serverHandle),
+            connectionType(connectionType) {}

        ConnectionSettings* settings;
+        ConnectionType connectionType;
+        int serverHandle;
    };

    class LogEvent : public Event
@@ -1062,10 +1241,10 @@ namespace Robomongo
    R_EVENT

        enum LogLevel {
-            ERROR  = 1,
-            WARN   = 2,
-            INFO   = 3,
-            DEBUG  = 100 // log as much as possible
+            RBM_ERROR  = 1,
+            RBM_WARN   = 2,
+            RBM_INFO   = 3,
+            RBM_DEBUG  = 100 // log as much as possible
        };

        LogEvent(QObject *sender, const std::string& message, LogLevel level) :
@@ -17,13 +17,22 @@ namespace Robomongo
        _languageOverride(languageOverride),
        _textWeights(textWeights) {}

-        ConnectionInfo::ConnectionInfo() :
+        ConnectionInfo::ConnectionInfo(std::string const& uuid) :
            _address(),
            _databases(),
-            _version(0.0f) {}
+            _version(0.0f),
+            _dbVersionStr(),
+            _uuid(uuid)
+        {}

-        ConnectionInfo::ConnectionInfo(const std::string &address, const std::vector<std::string> &databases, float version) :
+        ConnectionInfo::ConnectionInfo(const std::string &address, const std::vector<std::string> &databases, 
+            float version, const std::string& dbVersionStr, const std::string& storageEngine,
+            std::string const& uuid) :
           _address(address),
           _databases(databases),
-           _version(version) {}
+           _version(version),
+            _dbVersionStr(dbVersionStr),
+           _storageEngineType(storageEngine),
+           _uuid(uuid)
+        {}
 }
@@ -34,10 +34,15 @@ namespace Robomongo

    struct ConnectionInfo
    {
-        ConnectionInfo();
-        ConnectionInfo(const std::string &address, const std::vector<std::string> &databases, float version);
+        ConnectionInfo(std::string const& uuid);
+        ConnectionInfo(const std::string &address, const std::vector<std::string> &databases, float version, 
+                       const std::string& dbVersionStr, const std::string& storageEngine, 
+                       std::string const& uuid);
        const std::string _address;
        const std::vector<std::string> _databases;
        const float _version;
+        const std::string _dbVersionStr;
+        const std::string _storageEngineType;
+        std::string const _uuid;
    };
 }
@@ -1,5 +1,7 @@
 #include "robomongo/core/mongodb/MongoClient.h"

+#include "mongo/db/namespace_string.h"
+
 #include "robomongo/core/domain/MongoDocument.h"
 #include "robomongo/core/utils/BsonUtils.h"
 #include "robomongo/shell/bson/json.h"
@@ -12,22 +14,23 @@ namespace
    {
        using namespace Robomongo::BsonUtils;
        Robomongo::EnsureIndexInfo info(collection);
-        info._name = getField<mongo::String>(obj, "name");
-        mongo::BSONObj keyObj = getField<mongo::Object>(obj,"key");
-        if (keyObj.isValid()) {
+        info._name = obj.getStringField("name");
+        mongo::BSONObj keyObj = obj.getObjectField("key");
+        if (keyObj.isValid()) 
            info._request = jsonString(keyObj, mongo::TenGen, 1, Robomongo::DefaultEncoding, Robomongo::Utc);
-        }
-        info._unique = getField<mongo::Bool>(obj, "unique");
-        info._backGround = getField<mongo::Bool>(obj, "background");
-        info._dropDups = getField<mongo::Bool>(obj, "dropDups");
-        info._sparse = getField<mongo::Bool>(obj, "sparse");
+
+        info._unique = obj.getBoolField("unique");
+        info._backGround = obj.getBoolField("background");
+        info._dropDups = obj.getBoolField("dropDups");
+        info._sparse = obj.getBoolField("sparse");
        info._ttl = obj.getIntField("expireAfterSeconds");
-        info._defaultLanguage = getField<mongo::String>(obj, "default_language");
-        info._languageOverride = getField<mongo::String>(obj, "language_override");
-        mongo::BSONObj weightsObj = getField<mongo::Object>(obj, "weights");
-        if (weightsObj.isValid()) {
-            info._textWeights = jsonString(weightsObj, mongo::TenGen, 1, Robomongo::DefaultEncoding, Robomongo::Utc);
-        }
+        info._defaultLanguage = obj.getStringField("default_language");
+        info._languageOverride = obj.getStringField("language_override");
+        mongo::BSONObj weightsObj = obj.getObjectField("weights");
+        if (weightsObj.isValid()) 
+            info._textWeights = jsonString(weightsObj, mongo::TenGen, 1, Robomongo::DefaultEncoding, 
+                                           Robomongo::Utc);
+
        return info;
    }
 }
@@ -37,91 +40,113 @@ namespace Robomongo
    MongoClient::MongoClient(mongo::DBClientBase *const dbclient) :
        _dbclient(dbclient) { }

-    std::vector<std::string> MongoClient::getCollectionNames(const std::string &dbname) const
+    std::vector<std::string> MongoClient::getCollectionNamesWithDbname(const std::string &dbname) const
    {
-        typedef std::list<std::string> cont_string_t;
-        cont_string_t dbs = _dbclient->getCollectionNames(dbname);
+        std::list<mongo::BSONObj> collList = _dbclient->getCollectionInfos(dbname);

-        std::vector<std::string> stringList;
-        for (cont_string_t::const_iterator i = dbs.begin(); i != dbs.end(); i++) {
-            stringList.push_back(*i);
-        }
-        std::sort(stringList.begin(), stringList.end());
-        return stringList;
+        std::vector<std::string> collNames;	
+        for (auto const& coll : collList)
+            collNames.push_back(dbname + '.' + coll.getStringField("name")); // todo: verify
+
+        std::sort(collNames.begin(), collNames.end());
+        return collNames;
    }

-
+    // Warning: 
+    // Use string version dbVersionStr(), version number is corrupted after conversion to float
+    // Todo: Remove this function
    float MongoClient::getVersion() const
    {
        float result = 0.0f;
        mongo::BSONObj resultObj;
        _dbclient->runCommand("db", BSON("buildInfo" << "1"), resultObj);
-        std::string resultStr = BsonUtils::getField<mongo::String>(resultObj,"version");
+        std::string resultStr = BsonUtils::getField<mongo::String>(resultObj, "version");
        result = atof(resultStr.c_str());
        return result;
    }

+    std::string MongoClient::dbVersionStr() const
+    {
+        mongo::BSONObj resultObj;
+        _dbclient->runCommand("db", BSON("buildInfo" << "1"), resultObj);
+        std::string const resultStr = BsonUtils::getField<mongo::String>(resultObj, "version");
+        return resultStr;
+    }
+
+    std::string MongoClient::getStorageEngineType() const
+    {
+        mongo::BSONObj resultObj;
+        _dbclient->runCommand("db", BSON("serverStatus" << "1"), resultObj);
+        return resultObj.getObjectField("storageEngine").getStringField("name");
+    }
+
    std::vector<std::string> MongoClient::getDatabaseNames() const
    {
-        typedef std::list<std::string> cont_string_t;
-        cont_string_t dbs = _dbclient->getDatabaseNames();
-        std::vector<std::string> dbNames;
-        for (cont_string_t::const_iterator i = dbs.begin(); i != dbs.end(); ++i) {
-            dbNames.push_back(*i);
-        }
+        std::list<std::string> const& dbs = _dbclient->getDatabaseNames();
+        std::vector<std::string> dbNames = {dbs.begin(), dbs.end()};
        std::sort(dbNames.begin(), dbNames.end());
        return dbNames;
    }

    std::vector<MongoUser> MongoClient::getUsers(const std::string &dbName)
    {
-        MongoNamespace ns(dbName, "system.users");
-        std::vector<MongoUser> users;
+        mongo::BSONObjBuilder cmd;
+        cmd.append("usersInfo", 1);

-        std::unique_ptr<mongo::DBClientCursor> cursor(_dbclient->query(ns.toString(), mongo::Query()));
+        mongo::BSONObj result;
+        if (!_dbclient->runCommand(dbName, cmd.done(), result)) {
+            std::string errStr = result.getStringField("errmsg");
+            if (errStr.empty())
+                errStr = "Failed to get error message.";

-        // Cursor may be NULL, it means we have connectivity problem
-        if (!cursor)
-            throw mongo::DBException("Network error while attempting to load list of users", 0);
-
-        float ver = getVersion();
-        while (cursor->more()) {
-            mongo::BSONObj bsonObj = cursor->next();
-            MongoUser user(ver,bsonObj);
-            users.push_back(user);
+            throw std::runtime_error(errStr);
        }

+        std::vector<MongoUser> users;
+        for (auto const& usr : result.getField("users").Array())
+            users.push_back(MongoUser(getVersion(), usr.embeddedObject()));
+
        return users;
    }

-    void MongoClient::createUser(const std::string &dbName, const MongoUser &user, bool overwrite)
+    void MongoClient::createUser(const std::string &dbName, const MongoUser &user)
    {
-        MongoNamespace ns(dbName, "system.users");
-        mongo::BSONObj obj = user.toBson();
-
-        if (!overwrite) {
-            _dbclient->insert(ns.toString(), obj);
-        } else {
-            mongo::BSONElement id = obj.getField("_id");
-            mongo::BSONObjBuilder builder;
-            builder.append(id);
-            mongo::BSONObj bsonQuery = builder.obj();
-            mongo::Query query(bsonQuery);
-
-            _dbclient->update(ns.toString(), query, obj, true, false);
+        mongo::BSONObjBuilder cmd;
+        cmd.append("createUser", user.name());
+        cmd.append("pwd", user.password());
+        
+        mongo::BSONArrayBuilder roles;
+        auto const& rolesStrs = user.roles();
+        for (auto const& roleStr : rolesStrs) {
+            mongo::BSONObjBuilder role;
+            role.append("role", roleStr).append("db", user.userSource());
+            roles.append(role.done());
        }
+        cmd.appendArray("roles", roles.done());
+
+        mongo::BSONObj result;
+        if (!_dbclient->runCommand(dbName, cmd.done(), result)) {
+            std::string errStr = result.getStringField("errmsg");
+            if (errStr.empty())
+                errStr = "Failed to get error message.";
+   
+            throw std::runtime_error(errStr);
+        }       
    }

-    void MongoClient::dropUser(const std::string &dbName, const mongo::OID &id)
+    void MongoClient::dropUser(const std::string &dbName, const std::string &user)
    {
-        MongoNamespace ns(dbName, "system.users");
+        mongo::BSONObjBuilder cmd;
+        cmd.append("dropUser", user);

-        mongo::BSONObjBuilder builder;
-        builder.append("_id", id);
-        mongo::BSONObj bsonQuery = builder.obj();
-        mongo::Query query(bsonQuery);
+        mongo::BSONObj result;
+        if (!_dbclient->runCommand(dbName, cmd.done(), result)) {
+            std::string errStr = result.getStringField("errmsg");
+            if (errStr.empty())
+                errStr = "Failed to get error message.";

-        _dbclient->remove(ns.toString(), query, true);
+            throw std::runtime_error(errStr);
+        }
    }

    std::vector<MongoFunction> MongoClient::getFunctions(const std::string &dbName)
@@ -133,14 +158,13 @@ namespace Robomongo

        // Cursor may be NULL, it means we have connectivity problem
        if (!cursor)
-            throw mongo::DBException("Network error while attempting to load list of functions.", 0);
+            throw std::runtime_error("Network error while attempting to load list of functions.");

        while (cursor->more()) {
            mongo::BSONObj bsonObj = cursor->next();
-
            try {
-                MongoFunction user(bsonObj);
-                functions.push_back(user);
+                MongoFunction func(bsonObj);
+                functions.push_back(func);
            } catch (const std::exception &) {
                // skip invalid docs
            }
@@ -153,17 +177,15 @@ namespace Robomongo
        std::vector<EnsureIndexInfo> result;
        std::list<mongo::BSONObj> indexes = _dbclient->getIndexSpecs(collection.ns().toString());

-//        std::unique_ptr<mongo::DBClientCursor> cursor(_dbclient->getIndexSpecs(collection.ns().toString()));
-
        for (std::list<mongo::BSONObj>::iterator it = indexes.begin(); it != indexes.end(); ++it) {
            mongo::BSONObj bsonObj = *it;
-            result.push_back(makeEnsureIndexInfoFromBsonObj(collection,bsonObj));
+            result.push_back(makeEnsureIndexInfoFromBsonObj(collection, bsonObj));
        }

        return result;
    }

-    void MongoClient::ensureIndex(const EnsureIndexInfo &oldInfo,const EnsureIndexInfo &newInfo) const
+    void MongoClient::ensureIndex(const EnsureIndexInfo &oldInfo, const EnsureIndexInfo &newInfo) const
    {   
        std::string ns = newInfo._collection.ns().toString();

@@ -172,8 +194,8 @@ namespace Robomongo

        mongo::BSONObj keys = mongo::Robomongo::fromjson(newInfo._request);
        mongo::BSONObjBuilder toSave;
-        bool cache=true;
-        int version =-1;
+        bool cache = true;
+        int version = -1;

        toSave.append( "ns" , ns );
        toSave.append( "key" , keys );
@@ -284,36 +306,46 @@ namespace Robomongo
        _dbclient->dropIndex(collection.ns().toString(), indexName);
    }

-    void MongoClient::createFunction(const std::string &dbName, const MongoFunction &fun, const std::string &existingFunctionName /* = QString() */)
+    void MongoClient::createFunction(const std::string &dbName, const MongoFunction &fun, 
+                                     const std::string &existingFunctionName /* = QString() */)
    {
        MongoNamespace ns(dbName, "system.js");
        mongo::BSONObj obj = fun.toBson();

-        if (existingFunctionName.empty()) { // this is insert
+        if (existingFunctionName.empty()) { // create new function
            _dbclient->insert(ns.toString(), obj);
+            std::string errorStr = _dbclient->getLastError();
+            if (!errorStr.empty())
+                throw std::runtime_error(errorStr/* , 0 */);
        } else { // this is update

            std::string name = fun.name();

-            if (existingFunctionName == name) {
+            if (existingFunctionName == name) { // update existing function code
                mongo::BSONObjBuilder builder;
                builder.append("_id", name);
                mongo::BSONObj bsonQuery = builder.obj();
                mongo::Query query(bsonQuery);

                _dbclient->update(ns.toString(), query, obj, true, false);
-            } else {
+                std::string errorStr = _dbclient->getLastError();
+                if (!errorStr.empty())
+                    throw std::runtime_error(errorStr);
+            } else {    // update function name (remove & insert)
                _dbclient->insert(ns.toString(), obj);
-                std::string res = _dbclient->getLastError();
+                std::string errorStr = _dbclient->getLastError();

                // if no errors
-                if (res.empty()) {
+                if (errorStr.empty()) {
                    mongo::BSONObjBuilder builder;
                    builder.append("_id", existingFunctionName);
                    mongo::BSONObj bsonQuery = builder.obj();
                    mongo::Query query(bsonQuery);
                    _dbclient->remove(ns.toString(), query, true);
                }
+                else {
+                    throw std::runtime_error(errorStr);
+                }
            }
        }
    }
@@ -328,6 +360,9 @@ namespace Robomongo
        mongo::Query query(bsonQuery);

        _dbclient->remove(ns.toString(), query, true);
+        std::string errorStr = _dbclient->getLastError();
+        if (!errorStr.empty())
+            throw std::runtime_error(errorStr);
    }

    void MongoClient::createDatabase(const std::string &dbName)
@@ -337,12 +372,11 @@ namespace Robomongo
        *  This will create <dbName> database for us.
        *  Finally we are dropping just created temporary collection.
        */
-
        MongoNamespace ns(dbName, "temp");

        // If <dbName>.temp already exists, stop.
        if (_dbclient->exists(ns.toString()))
-            return;
+            throw std::runtime_error(dbName + ".temp already exists.");

        // Building { _id : "temp" } document
        mongo::BSONObjBuilder builder;
@@ -351,6 +385,9 @@ namespace Robomongo

        // Insert this document
        _dbclient->insert(ns.toString(), obj);
+        std::string errorStr = _dbclient->getLastError();
+        if (!errorStr.empty())
+            throw std::runtime_error(errorStr);

        // Drop temp collection
        _dbclient->dropCollection(ns.toString());
@@ -358,12 +395,50 @@ namespace Robomongo

    void MongoClient::dropDatabase(const std::string &dbName)
    {
-        _dbclient->dropDatabase(dbName);
+        mongo::BSONObj info;
+        if (!_dbclient->dropDatabase(dbName, mongo::WriteConcernOptions(), &info)) { // todo: do we catch errorStr via info - test it??
+            std::string errStr = info.toString();
+            if (errStr.empty())
+                errStr = "Failed to get error message.";
+
+            throw std::runtime_error(errStr);
+        }
    }

-    void MongoClient::createCollection(const MongoNamespace &ns)
+    void MongoClient::createCollection(const std::string& ns, long long size, bool capped, int max, 
+                                       const mongo::BSONObj& extraOptions, mongo::BSONObj* info)
    {
-        _dbclient->createCollection(ns.toString());
+        verify(!capped || size);
+        mongo::BSONObj o;
+        if (info == 0)
+            info = &o;
+        mongo::BSONObjBuilder b;
+        std::string db = mongo::nsToDatabase(ns);
+        b.append("create", ns.c_str() + db.length() + 1);
+        if (size) {
+            b.append("size", size);
+        }
+        if (capped) {
+            b.append("capped", true);
+        }
+        if (max) {
+            b.append("max", max);
+        }
+        b.appendElements(extraOptions);
+
+        if (!_dbclient->exists(ns)) {
+            mongo::BSONObj result;
+            if (!_dbclient->runCommand(db.c_str(), b.done(), result)) {
+                std::string errStr = result.getStringField("errmsg");
+                if (errStr.empty())
+                    errStr = "Failed to get error message.";
+
+                throw std::runtime_error(errStr);
+            }
+        }
+        else {
+            throw std::runtime_error("Collection with same name already exists.");
+        }
    }

    void MongoClient::renameCollection(const MongoNamespace &ns, const std::string &newCollectionName)
@@ -377,30 +452,51 @@ namespace Robomongo
        command.append("to", to.toString());

        mongo::BSONObj result;
-        _dbclient->runCommand("admin", command.obj(), result); // this command should be run against "admin" db
+        if (!_dbclient->runCommand("admin", command.obj(), result)) { // this command should be run against "admin" db
+            std::string errStr = result.getStringField("errmsg");
+            if (errStr.empty())
+                errStr = "Failed to get error message.";
+
+            throw std::runtime_error(errStr);
+        }
    }

    void MongoClient::duplicateCollection(const MongoNamespace &ns, const std::string &newCollectionName)
    {
-        MongoNamespace from(ns);
-        MongoNamespace to(ns.databaseName(), newCollectionName);
+        MongoNamespace sourceCollection(ns);
+        MongoNamespace newCollection(ns.databaseName(), newCollectionName);

-        if (!_dbclient->exists(to.toString()))
-            _dbclient->createCollection(to.toString());
+        if (!_dbclient->exists(newCollection.toString())) {
+            mongo::BSONObj result;
+            // todo: Issue #1258 : Duplicate Collection should support advanced collection options.
+            //       _dbclient->createCollection() should be called with properties of source collection
+            //       not with default parameters as below.
+            if (!_dbclient->createCollection(newCollection.toString(), 0, false, 0, &result)) {
+                std::string errStr = result.getStringField("errmsg");
+                if (errStr.empty())
+                    errStr = "Failed to get error message.";

-        std::unique_ptr<mongo::DBClientCursor> cursor(_dbclient->query(from.toString(), mongo::Query()));
+                throw std::runtime_error(errStr);
+            }
+        }
+        else {
+            throw std::runtime_error("Collection with same name already exists.");
+        }
+
+        std::unique_ptr<mongo::DBClientCursor> cursor(_dbclient->query(sourceCollection.toString(), mongo::Query()));

        // Cursor may be NULL, it means we have connectivity problem
        if (!cursor)
-            throw mongo::DBException("Network error while attempting to run query", 0);
+            throw std::runtime_error("Network error while attempting to run query");

        while (cursor->more()) {
            mongo::BSONObj bsonObj = cursor->next();
-            _dbclient->insert(to.toString(), bsonObj);
+            _dbclient->insert(newCollection.toString(), bsonObj);
        }
    }

-    void MongoClient::copyCollectionToDiffServer(mongo::DBClientBase *const fromServ,const MongoNamespace &from, const MongoNamespace &to)
+    void MongoClient::copyCollectionToDiffServer(mongo::DBClientBase *const fromServ, const MongoNamespace &from, 
+                                                 const MongoNamespace &to)
    {
        if (!_dbclient->exists(to.toString()))
            _dbclient->createCollection(to.toString());
@@ -409,7 +505,7 @@ namespace Robomongo

        // Cursor may be NULL, it means we have connectivity problem
        if (!cursor)
-            throw mongo::DBException("Network error while attempting to run query", 0);
+            throw std::runtime_error("Network error while attempting to run query");

        while (cursor->more()) {
            mongo::BSONObj bsonObj = cursor->next();
@@ -419,16 +515,31 @@ namespace Robomongo

    void MongoClient::dropCollection(const MongoNamespace &ns)
    {
-        _dbclient->dropCollection(ns.toString());
+        if (_dbclient->exists(ns.toString())) {
+            mongo::BSONObj info;
+            if (!_dbclient->dropCollection(ns.toString(), mongo::WriteConcernOptions(), &info)) { 
+                std::string errStr = info.toString();
+                if (errStr.empty())
+                    errStr = "Failed to get error message.";
+
+                throw std::runtime_error(errStr);
+            }
+        }
+        else {
+            throw std::runtime_error("Collection does not exist.");
+        }
    }

-    void MongoClient::insertDocument(const mongo::BSONObj &obj, const MongoNamespace &ns)
+    void MongoClient::insertDocument(const mongo::BSONObj &obj, const MongoNamespace &ns, bool const replicaSetConnectionWithAuth)
    {
        _dbclient->insert(ns.toString(), obj);
-        checkLastErrorAndThrow(ns.databaseName());
+        // Robo 1.3: This if() is added with MongoDB 4.0, checkLastErrorAndThrow throws exception 
+        // with unknown reason when the connection is replica set with auth.
+        if (!replicaSetConnectionWithAuth)  
+            checkLastErrorAndThrow(ns.databaseName());
    }

-    void MongoClient::saveDocument(const mongo::BSONObj &obj, const MongoNamespace &ns)
+    void MongoClient::saveDocument(const mongo::BSONObj &obj, const MongoNamespace &ns, bool const replicaSetConnectionWithAuth)
    {
        mongo::BSONElement id = obj.getField("_id");
        mongo::BSONObjBuilder builder;
@@ -437,13 +548,16 @@ namespace Robomongo
        mongo::Query query(bsonQuery);

        _dbclient->update(ns.toString(), query, obj, true, false);
-        checkLastErrorAndThrow(ns.databaseName());
+        if(!replicaSetConnectionWithAuth)
+            checkLastErrorAndThrow(ns.databaseName());
    }

-    void MongoClient::removeDocuments(const MongoNamespace &ns, mongo::Query query, bool justOne /*= true*/)
+    void MongoClient::removeDocuments(const MongoNamespace &ns, mongo::Query query, bool const replicaSetConnectionWithAuth, 
+                                      bool justOne /*= true*/)
    {
        _dbclient->remove(ns.toString(), query, justOne);
-        checkLastErrorAndThrow(ns.databaseName());
+        if (!replicaSetConnectionWithAuth)
+            checkLastErrorAndThrow(ns.databaseName());
    }

    std::vector<MongoDocumentPtr> MongoClient::query(const MongoQueryInfo &info)
@@ -463,7 +577,7 @@ namespace Robomongo

        // DBClientBase::query may return nullptr
        if (!cursor)
-            throw mongo::DBException("Network error while attempting to run query", 0);
+            throw std::runtime_error("Network error while attempting to run query");

        while (cursor->more()) {
            mongo::BSONObj bsonObj = cursor->next();
@@ -497,11 +611,10 @@ namespace Robomongo
    std::vector<MongoCollectionInfo> MongoClient::runCollStatsCommand(const std::vector<std::string> &namespaces)
    {
        std::vector<MongoCollectionInfo> infos;
-        for (std::vector<std::string>::const_iterator it = namespaces.begin(); it!=namespaces.end(); ++it) {
-            MongoCollectionInfo info = runCollStatsCommand(*it);
-            if (info.ns().isValid()){
+        for (auto const& ns : namespaces) {
+            MongoCollectionInfo info = runCollStatsCommand(ns);
+            if (info.ns().isValid()) 
                infos.push_back(info);
-            }            
        }
        return infos;
    }
@@ -520,6 +633,6 @@ namespace Robomongo
        if (lastError.empty())
            return;

-        throw mongo::DBException(lastError, mongo::ErrorCodes::InternalError);
+        throw std::runtime_error(lastError/*, mongo::ErrorCodes::InternalError*/);
    }
 }
@@ -1,6 +1,8 @@
 #pragma once

 #include <mongo/client/dbclientinterface.h>
+#include <mongo/bson/bsonobj.h>
+
 #include "robomongo/core/Core.h"
 #include "robomongo/core/domain/MongoQueryInfo.h"
 #include "robomongo/core/domain/MongoUser.h"
@@ -14,13 +16,15 @@ namespace Robomongo
    public:
        MongoClient(mongo::DBClientBase *const scopedConnection);

-        std::vector<std::string> getCollectionNames(const std::string &dbname) const;
+        std::vector<std::string> getCollectionNamesWithDbname(const std::string &dbname) const;
        std::vector<std::string> getDatabaseNames() const;
        float getVersion() const;
+        std::string dbVersionStr() const;
+        std::string getStorageEngineType() const;

        std::vector<MongoUser> getUsers(const std::string &dbName);
-        void createUser(const std::string &dbName, const MongoUser &user, bool overwrite);
-        void dropUser(const std::string &dbName, const mongo::OID &id);
+        void createUser(const std::string &dbName, const MongoUser &user);
+        void dropUser(const std::string &dbName, const std::string &user);

        std::vector<MongoFunction> getFunctions(const std::string &dbName);
        std::vector<EnsureIndexInfo> getIndexes(const MongoCollectionInfo &collection) const;
@@ -37,15 +41,15 @@ namespace Robomongo
        void createDatabase(const std::string &dbName);
        void dropDatabase(const std::string &dbName);

-        void createCollection(const MongoNamespace &ns);
+        void createCollection(const std::string &ns, long long size, bool capped, int max, const mongo::BSONObj& extraOptions, mongo::BSONObj* info = nullptr);
        void renameCollection(const MongoNamespace &ns, const std::string &newCollectionName);
        void duplicateCollection(const MongoNamespace &ns, const std::string &newCollectionName);
        void dropCollection(const MongoNamespace &ns);
-        void copyCollectionToDiffServer(mongo::DBClientBase *const,const MongoNamespace &from, const MongoNamespace &to);
+        void copyCollectionToDiffServer(mongo::DBClientBase *const, const MongoNamespace &from, const MongoNamespace &to);

-        void insertDocument(const mongo::BSONObj &obj, const MongoNamespace &ns);
-        void saveDocument(const mongo::BSONObj &obj, const MongoNamespace &ns);
-        void removeDocuments(const MongoNamespace &ns, mongo::Query query, bool justOne = true);
+        void insertDocument(const mongo::BSONObj &obj, const MongoNamespace &ns, bool const replicaSetConnectionWithAuth);
+        void saveDocument(const mongo::BSONObj &obj, const MongoNamespace &ns, bool const replicaSetConnectionWithAuth);
+        void removeDocuments(const MongoNamespace &ns, mongo::Query query, bool const replicaSetConnectionWithAuth, bool justOne = true);
        std::vector<MongoDocumentPtr> query(const MongoQueryInfo &info);

        MongoCollectionInfo runCollStatsCommand(const std::string &ns);
--- a/Show More
+++ b/Show More