diff --git a/README.md b/README.md
index 200ffac..cbe90ca 100644
--- a/README.md
+++ b/README.md
@@ -16,18 +16,20 @@ var sshInstance = new smartssh.sshInstance({
 sshInstance.addKey(new smartssh.sshKey({ 
     private: "somestring",
     public: "somestring", // optional
-    for:"github.com",
+    host:"github.com",
     encoding: "base64" // optional, defaults to "utf8", can be "utf8" or "base64", useful for reading ssh keys from environment variables
 }));
 
+sshInstance.removeKey(sshInstance.getKey("github.com")); // removes key for host "github.com" is present
+
 sshInstance.createKey({
-    for:"gitlab.com" // returns new key in the form sshKey, read more about the sshKey class below
+    host:"gitlab.com" // returns new key in the form sshKey, read more about the sshKey class below
 })
 
 sshInstance.getKey({ // returns ssh key in the form sshKey, read more about the sshKey class below
-    for:"github.com"
+    host:"github.com"
 });
 
 sshInstance.getKeys() // returns array of all available getKeys. Each key is in form of class sshKey
 
-```
\ No newline at end of file
+```
diff --git a/dist/smartssh.classes.js b/dist/smartssh.classes.js
index b7e7e65..bbda2d3 100644
--- a/dist/smartssh.classes.js
+++ b/dist/smartssh.classes.js
@@ -5,16 +5,47 @@ var helpers = require("./smartssh.classes.helpers");
 var ssh = (function () {
     function ssh(optionsArg) {
         if (optionsArg === void 0) { optionsArg = {}; }
-        this.sshDir = optionsArg.sshDir;
-        this.sshDir ?
-            this.sshKeys = helpers.sshKeyArrayFromDir(this.sshDir)
-            : void (0);
-        this.sync = optionsArg.sync;
+        this.sshDir = new sshDir(optionsArg.sshDir);
+        this.sshKeys = this.sshDir.getKeys();
+        this.sshSync = optionsArg.sshSync;
     }
     ;
+    ssh.prototype.addKey = function (sshKeyArg) {
+        this.sshKeys.push(sshKeyArg);
+        this.sync();
+    };
+    ;
+    ssh.prototype.getKey = function (hostArg) {
+        var filteredArray = this.sshKeys.filter(function (keyArg) {
+            return (keyArg.host == hostArg);
+        });
+        if (filteredArray.length > 0) {
+            return filteredArray[0];
+        }
+        else {
+            return undefined;
+        }
+    };
+    ;
+    ssh.prototype.sync = function () {
+        this.sshDir.sync(this.sshConfig, this.sshKeys); //call sync method of sshDir class;
+    };
+    ;
     return ssh;
 }());
 exports.ssh = ssh;
+var sshDir = (function () {
+    function sshDir(sshDirPathArg) {
+        this.path = sshDirPathArg;
+    }
+    sshDir.prototype.sync = function (sshConfigArg, sshKeysArg) {
+    };
+    ;
+    sshDir.prototype.getKeys = function () {
+        return helpers.sshKeyArrayFromDir(this.path);
+    };
+    return sshDir;
+}());
 var sshConfig = (function () {
     function sshConfig() {
     }
@@ -23,18 +54,29 @@ var sshConfig = (function () {
 exports.sshConfig = sshConfig;
 var sshKey = (function () {
     function sshKey(optionsArg) {
-        if (!optionsArg)
-            optionsArg = { private: undefined, public: undefined };
+        if (optionsArg === void 0) { optionsArg = {}; }
         this.privKey = optionsArg.private;
         this.pubKey = optionsArg.public;
+        this.hostVar = optionsArg.host;
     }
     ;
-    Object.defineProperty(sshKey.prototype, "privateKey", {
+    Object.defineProperty(sshKey.prototype, "host", {
         // getters
+        get: function () {
+            return this.hostVar;
+        },
+        // setters
+        set: function (hostArg) {
+            this.hostVar = hostArg;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    ;
+    Object.defineProperty(sshKey.prototype, "privateKey", {
         get: function () {
             return this.privKey;
         },
-        // setters
         set: function (privateKeyArg) {
             this.privKey = privateKeyArg;
         },
@@ -85,6 +127,7 @@ var sshKey = (function () {
     ;
     ;
     ;
+    ;
     sshKey.prototype.store = function (filePathArg) {
         var filePathObj = plugins.path.parse(filePathArg);
         if (filePathObj.ext = ".priv") {
@@ -103,4 +146,4 @@ var sshKey = (function () {
 }());
 exports.sshKey = sshKey;
 
-//# sourceMappingURL=data:application/json;base64,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QyxDQUFBLENBQUM7WUFDMUIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUMsRUFBQyxRQUFRLEVBQUMsV0FBVyxDQUFDLElBQUksR0FBRyxXQUFXLENBQUMsR0FBRyxFQUFDLFFBQVEsRUFBQyxXQUFXLENBQUMsR0FBRyxFQUFDLENBQUMsQ0FBQztRQUMzSCxDQUFDO1FBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxHQUFHLEdBQUcsTUFBTSxDQUFDLENBQUEsQ0FBQztZQUNqQyxPQUFPLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBQyxFQUFDLFFBQVEsRUFBQyxXQUFXLENBQUMsSUFBSSxHQUFHLFdBQVcsQ0FBQyxHQUFHLEVBQUMsUUFBUSxFQUFDLFdBQVcsQ0FBQyxHQUFHLEVBQUMsQ0FBQyxDQUFDO1FBQzFILENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNKLE9BQU8sQ0FBQyxFQUFFLENBQUMsYUFBYSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUMxQyxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxHQUFHLEVBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLGdDQUFnQztZQUMzRixJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxHQUFHLEVBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLGdDQUFnQztRQUMvRixDQUFDO0lBQ0wsQ0FBQztJQUNMLGFBQUM7QUFBRCxDQXJEQSxBQXFEQyxJQUFBO0FBckRZLGNBQU0sU0FxRGxCLENBQUEiLCJmaWxlIjoic21hcnRzc2guY2xhc3Nlcy5qcyIsInNvdXJjZXNDb250ZW50IjpbIi8vLyA8cmVmZXJlbmNlIHBhdGg9XCIuL3R5cGluZ3MvbWFpbi5kLnRzXCIgLz5cbmltcG9ydCBwbHVnaW5zID0gcmVxdWlyZShcIi4vc21hcnRzc2gucGx1Z2luc1wiKTtcbmltcG9ydCBoZWxwZXJzID0gcmVxdWlyZShcIi4vc21hcnRzc2guY2xhc3Nlcy5oZWxwZXJzXCIpO1xuXG5leHBvcnQgY2xhc3Mgc3NoIHtcbiAgICBwcml2YXRlIHNzaERpcjpzdHJpbmc7XG4gICAgcHJpdmF0ZSBzc2hLZXlzOnNzaEtleVtdO1xuICAgIHByaXZhdGUgc3luYzpib29sZWFuOyAvLyBpZiBzZXQgdG8gdHJ1ZSwgdGhlIHNzaCBkaXIgd2lsbCBiZSBrZXB0IGluIHN5bmMgYXV0b21hdGljYWxseVxuICAgIGNvbnN0cnVjdG9yKG9wdGlvbnNBcmc6e3NzaERpcj86c3RyaW5nLHN5bmM/OmJvb2xlYW59PXt9KXtcbiAgICAgICAgdGhpcy5zc2hEaXIgPSBvcHRpb25zQXJnLnNzaERpclxuICAgICAgICB0aGlzLnNzaERpciA/XG4gICAgICAgICAgICB0aGlzLnNzaEtleXMgPSBoZWxwZXJzLnNzaEtleUFycmF5RnJvbURpcih0aGlzLnNzaERpcilcbiAgICAgICAgICAgIDogdm9pZCgwKTtcbiAgICAgICAgdGhpcy5zeW5jID0gb3B0aW9uc0FyZy5zeW5jO1xuICAgIH07XG4gICAgXG59XG5cbmV4cG9ydCBjbGFzcyBzc2hDb25maWcge1xuICAgIGNvbnN0cnVjdG9yKCl7XG4gICAgICAgIFxuICAgIH1cbn1cblxuZXhwb3J0IGNsYXNzIHNzaEtleSB7XG4gICAgcHJpdmF0ZSBwcml2S2V5OnN0cmluZztcbiAgICBwcml2YXRlIHB1YktleTpzdHJpbmc7XG4gICAgY29uc3RydWN0b3Iob3B0aW9uc0FyZzp7cHJpdmF0ZTpzdHJpbmcscHVibGljOnN0cmluZ30pe1xuICAgICAgICBpZighb3B0aW9uc0FyZykgb3B0aW9uc0FyZyA9IHtwcml2YXRlOnVuZGVmaW5lZCxwdWJsaWM6dW5kZWZpbmVkfTtcbiAgICAgICAgdGhpcy5wcml2S2V5ID0gb3B0aW9uc0FyZy5wcml2YXRlO1xuICAgICAgICB0aGlzLnB1YktleSA9IG9wdGlvbnNBcmcucHVibGljO1xuICAgIH07XG4gICAgXG4gICAgLy8gZ2V0dGVyc1xuICAgIGdldCBwcml2YXRlS2V5KCl7XG4gICAgICAgIHJldHVybiB0aGlzLnByaXZLZXk7XG4gICAgfTtcbiAgICBnZXQgcHJpdmF0ZUtleUJhc2U2NCgpe1xuICAgICAgICByZXR1cm4gcGx1Z2lucy5iYXNlNjQuZW5jb2RlKHRoaXMucHJpdktleSk7XG4gICAgfVxuICAgIGdldCBwdWJsaWNLZXkoKXtcbiAgICAgICAgcmV0dXJuIHRoaXMucHVibGljS2V5O1xuICAgIH1cbiAgICBnZXQgcHVibGljS2V5QmFzZTY0KCl7XG4gICAgICAgIHJldHVybiBwbHVnaW5zLmJhc2U2NC5lbmNvZGUodGhpcy5wdWJLZXkpO1xuICAgIH1cbiAgICBnZXQgdHlwZSgpe1xuICAgICAgICBpZih0aGlzLnByaXZLZXkgJiYgdGhpcy5wdWJLZXkpe1xuICAgICAgICAgICAgcmV0dXJuIFwiZHVwbGV4XCI7XG4gICAgICAgIH0gZWxzZSBpZih0aGlzLnByaXZLZXkpe1xuICAgICAgICAgICAgcmV0dXJuIFwicHJpdmF0ZVwiO1xuICAgICAgICB9IGVsc2UgaWYodGhpcy5wdWJLZXkpe1xuICAgICAgICAgICAgcmV0dXJuIFwicHVibGljXCI7XG4gICAgICAgIH1cbiAgICB9O1xuICAgIFxuICAgIC8vIHNldHRlcnNcbiAgICBzZXQgcHJpdmF0ZUtleShwcml2YXRlS2V5QXJnOnN0cmluZyl7XG4gICAgICAgIHRoaXMucHJpdktleSA9IHByaXZhdGVLZXlBcmc7XG4gICAgfTtcbiAgICAvLyBzZXR0ZXJzXG4gICAgc2V0IHB1YmxpY0tleShwdWJsaWNLZXlBcmc6c3RyaW5nKXtcbiAgICAgICAgdGhpcy5wdWJLZXkgPSBwdWJsaWNLZXlBcmc7XG4gICAgfTtcbiAgICBcbiAgICBzdG9yZShmaWxlUGF0aEFyZz86c3RyaW5nKXtcbiAgICAgICAgbGV0IGZpbGVQYXRoT2JqID0gcGx1Z2lucy5wYXRoLnBhcnNlKGZpbGVQYXRoQXJnKTtcbiAgICAgICAgaWYoZmlsZVBhdGhPYmouZXh0ID0gXCIucHJpdlwiKXtcbiAgICAgICAgICAgIHBsdWdpbnMuc21hcnRmaWxlLm1lbW9yeS50b0ZzU3luYyh0aGlzLnByaXZLZXkse2ZpbGVOYW1lOmZpbGVQYXRoT2JqLm5hbWUgKyBmaWxlUGF0aE9iai5leHQsZmlsZVBhdGg6ZmlsZVBhdGhPYmouZGlyfSk7XG4gICAgICAgIH0gZWxzZSBpZiAoZmlsZVBhdGhPYmouZXh0ID0gXCIucHViXCIpe1xuICAgICAgICAgICAgcGx1Z2lucy5zbWFydGZpbGUubWVtb3J5LnRvRnNTeW5jKHRoaXMucHViS2V5LHtmaWxlTmFtZTpmaWxlUGF0aE9iai5uYW1lICsgZmlsZVBhdGhPYmouZXh0LGZpbGVQYXRoOmZpbGVQYXRoT2JqLmRpcn0pO1xuICAgICAgICB9IGVsc2UgeyAvL3dlIGFzc3VtZSB3ZSBhcmUgZ2l2ZW4gYSBkaXJlY3RvcnkgYXMgZmlsZVBhdGhBcmcsIHNvIHdlIHN0b3JlIHRoZSB3aG9sZSBrZXlcbiAgICAgICAgICAgIHBsdWdpbnMuZnMuZW5zdXJlRGlyU3luYyhmaWxlUGF0aE9iai5kaXIpO1xuICAgICAgICAgICAgdGhpcy5zdG9yZShwbHVnaW5zLnBhdGguam9pbihmaWxlUGF0aE9iai5kaXIsXCJrZXkucHJpdlwiKSk7IC8vIGNhbGwgdGhpcyBmdW5jdGlvbiByZWN1cnNpdmx5XG4gICAgICAgICAgICB0aGlzLnN0b3JlKHBsdWdpbnMucGF0aC5qb2luKGZpbGVQYXRoT2JqLmRpcixcImtleS5wcml2XCIpKTsgLy8gY2FsbCB0aGlzIGZ1bmN0aW9uIHJlY3Vyc2l2bHlcbiAgICAgICAgfVxuICAgIH1cbn0iXSwic291cmNlUm9vdCI6Ii9zb3VyY2UvIn0=
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["smartssh.classes.ts"],"names":[],"mappings":"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","file":"smartssh.classes.js","sourcesContent":["/// <reference path=\"./typings/main.d.ts\" />\nimport plugins = require(\"./smartssh.plugins\");\nimport helpers = require(\"./smartssh.classes.helpers\");\n\nexport class ssh {\n    private sshConfig:sshConfig;\n    private sshDir:sshDir;\n    private sshKeys:sshKey[]; //holds all ssh keys\n    private sshSync:boolean; // if set to true, the ssh dir will be kept in sync automatically\n    constructor(optionsArg:{sshDir?:string,sshSync?:boolean}={}){\n        this.sshDir = new sshDir(optionsArg.sshDir);\n        this.sshKeys = this.sshDir.getKeys();\n        this.sshSync = optionsArg.sshSync;\n    };\n    addKey(sshKeyArg:sshKey){\n        this.sshKeys.push(sshKeyArg);\n        this.sync();\n    };\n    getKey(hostArg:string){\n        let filteredArray = this.sshKeys.filter(function(keyArg){\n            return (keyArg.host == hostArg);\n        });\n        if(filteredArray.length > 0){\n            return filteredArray[0];\n        } else {\n            return undefined;\n        }\n    };\n    sync(){\n        this.sshDir.sync(this.sshConfig,this.sshKeys); //call sync method of sshDir class;\n    };\n}\n\nclass sshDir { // sshDir class -> NOT EXPORTED, ONLY FOR INTERNAL USE\n    path:string;\n    constructor(sshDirPathArg:string){\n        this.path = sshDirPathArg;\n    }\n    sync(sshConfigArg:sshConfig,sshKeysArg:sshKey[]){\n        \n    };\n    getKeys(){\n        return helpers.sshKeyArrayFromDir(this.path);\n    }\n}\n\nexport class sshConfig {\n    constructor(){\n        \n    }\n}\n\nexport class sshKey {\n    private privKey:string;\n    private pubKey:string;\n    private hostVar:string;\n    constructor(optionsArg:{private?:string,public?:string,host?:string}={}){\n        this.privKey = optionsArg.private;\n        this.pubKey = optionsArg.public;\n        this.hostVar = optionsArg.host;\n    };\n    \n    // getters\n    get host(){\n        return this.hostVar;\n    };\n    get privateKey(){\n        return this.privKey;\n    };\n    get privateKeyBase64(){\n        return plugins.base64.encode(this.privKey);\n    }\n    get publicKey(){\n        return this.publicKey;\n    }\n    get publicKeyBase64(){\n        return plugins.base64.encode(this.pubKey);\n    }\n    get type(){\n        if(this.privKey && this.pubKey){\n            return \"duplex\";\n        } else if(this.privKey){\n            return \"private\";\n        } else if(this.pubKey){\n            return \"public\";\n        }\n    };\n    \n    // setters\n    set host(hostArg:string){\n        this.hostVar = hostArg;\n    };\n    set privateKey(privateKeyArg:string){\n        this.privKey = privateKeyArg;\n    };\n    // setters\n    set publicKey(publicKeyArg:string){\n        this.pubKey = publicKeyArg;\n    };\n    \n    store(filePathArg?:string){\n        let filePathObj = plugins.path.parse(filePathArg);\n        if(filePathObj.ext = \".priv\"){\n            plugins.smartfile.memory.toFsSync(this.privKey,{fileName:filePathObj.name + filePathObj.ext,filePath:filePathObj.dir});\n        } else if (filePathObj.ext = \".pub\"){\n            plugins.smartfile.memory.toFsSync(this.pubKey,{fileName:filePathObj.name + filePathObj.ext,filePath:filePathObj.dir});\n        } else { //we assume we are given a directory as filePathArg, so we store the whole key\n            plugins.fs.ensureDirSync(filePathObj.dir);\n            this.store(plugins.path.join(filePathObj.dir,\"key.priv\")); // call this function recursivly\n            this.store(plugins.path.join(filePathObj.dir,\"key.priv\")); // call this function recursivly\n        }\n    }\n}"],"sourceRoot":"/source/"}
diff --git a/ts/smartssh.classes.ts b/ts/smartssh.classes.ts
index 9edc2ea..ecadd8b 100644
--- a/ts/smartssh.classes.ts
+++ b/ts/smartssh.classes.ts
@@ -3,17 +3,45 @@ import plugins = require("./smartssh.plugins");
 import helpers = require("./smartssh.classes.helpers");
 
 export class ssh {
-    private sshDir:string;
-    private sshKeys:sshKey[];
+    private sshConfig:sshConfig;
+    private sshDir:sshDir;
+    private sshKeys:sshKey[]; //holds all ssh keys
     private sshSync:boolean; // if set to true, the ssh dir will be kept in sync automatically
     constructor(optionsArg:{sshDir?:string,sshSync?:boolean}={}){
-        this.sshDir = optionsArg.sshDir
-        this.sshDir ?
-            this.sshKeys = helpers.sshKeyArrayFromDir(this.sshDir)
-            : void(0);
+        this.sshDir = new sshDir(optionsArg.sshDir);
+        this.sshKeys = this.sshDir.getKeys();
         this.sshSync = optionsArg.sshSync;
     };
-    
+    addKey(sshKeyArg:sshKey){
+        this.sshKeys.push(sshKeyArg);
+        this.sync();
+    };
+    getKey(hostArg:string){
+        let filteredArray = this.sshKeys.filter(function(keyArg){
+            return (keyArg.host == hostArg);
+        });
+        if(filteredArray.length > 0){
+            return filteredArray[0];
+        } else {
+            return undefined;
+        }
+    };
+    sync(){
+        this.sshDir.sync(this.sshConfig,this.sshKeys); //call sync method of sshDir class;
+    };
+}
+
+class sshDir { // sshDir class -> NOT EXPORTED, ONLY FOR INTERNAL USE
+    path:string;
+    constructor(sshDirPathArg:string){
+        this.path = sshDirPathArg;
+    }
+    sync(sshConfigArg:sshConfig,sshKeysArg:sshKey[]){
+        
+    };
+    getKeys(){
+        return helpers.sshKeyArrayFromDir(this.path);
+    }
 }
 
 export class sshConfig {
@@ -25,13 +53,17 @@ export class sshConfig {
 export class sshKey {
     private privKey:string;
     private pubKey:string;
-    constructor(optionsArg:{private:string,public:string}){
-        if(!optionsArg) optionsArg = {private:undefined,public:undefined};
+    private hostVar:string;
+    constructor(optionsArg:{private?:string,public?:string,host?:string}={}){
         this.privKey = optionsArg.private;
         this.pubKey = optionsArg.public;
+        this.hostVar = optionsArg.host;
     };
     
     // getters
+    get host(){
+        return this.hostVar;
+    };
     get privateKey(){
         return this.privKey;
     };
@@ -55,6 +87,9 @@ export class sshKey {
     };
     
     // setters
+    set host(hostArg:string){
+        this.hostVar = hostArg;
+    };
     set privateKey(privateKeyArg:string){
         this.privKey = privateKeyArg;
     };