diff --git a/client/.gvc/logs/gvclog.log b/client/.gvc/logs/gvclog.log
index 2e118d8..5732124 100644
--- a/client/.gvc/logs/gvclog.log
+++ b/client/.gvc/logs/gvclog.log
@@ -1,304 +1,16 @@
 {"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Adding all files..."}
-{"level":"info","message":"skipping .gvc directory"}
-{"level":"error","module":"database","error":"database not open","message":"Error finding file by path"}
-{"level":"error","module":"database","error":"database not open","message":"Error initialising file in database"}
-{"level":"error","message":"Error checking if file [.gvcignore.toml] is monitored. Error database not open"}
-{"level":"info","message":"No files found that could be added to tracked"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Adding all files..."}
-{"level":"info","message":"skipping .gvc directory"}
-{"level":"error","module":"database","error":"database not open","message":"Error finding file by path"}
-{"level":"error","module":"database","error":"database not open","message":"Error initialising file in database"}
-{"level":"error","message":"Error checking if file [.gvcignore.toml] is monitored. Error database not open"}
-{"level":"info","message":"No files found that could be added to tracked"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Adding all files..."}
-{"level":"info","message":"skipping .gvc directory"}
-{"level":"error","module":"database","error":"database not open","message":"Error finding file by path"}
-{"level":"error","module":"database","error":"database not open","message":"Error initialising file in database"}
-{"level":"error","message":"Error checking if file [.gvcignore.toml] is monitored. Error database not open"}
-{"level":"info","message":"No files found that could be added to tracked"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Adding all files..."}
-{"level":"info","message":"skipping .gvc directory"}
-{"level":"error","module":"database","error":"database not open","message":"Error finding file by path"}
-{"level":"error","module":"database","error":"database not open","message":"Error initialising file in database"}
-{"level":"error","message":"Error checking if file [.gvcignore.toml] is monitored. Error database not open"}
-{"level":"info","message":"No files found that could be added to tracked"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Adding all files..."}
-{"level":"info","message":"skipping .gvc directory"}
-{"level":"error","module":"database","error":"database not open","message":"Error finding file by path"}
-{"level":"error","module":"database","error":"database not open","message":"Error initialising file in database"}
-{"level":"error","message":"Error checking if file [.gvcignore.toml] is monitored. Error database not open"}
-{"level":"info","message":"No files found that could be added to tracked"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Adding all files..."}
-{"level":"info","message":"skipping .gvc directory"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\.gvcignore.toml"}
-{"level":"error","module":"database","error":"database not open","message":"Error finding file by path"}
-{"level":"error","module":"database","error":"database not open","message":"Error initialising file in database"}
-{"level":"error","message":"Error checking if file [.gvcignore.toml] is monitored. Error database not open"}
-{"level":"info","message":"No files found that could be added to tracked"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Adding all files..."}
-{"level":"info","message":"skipping .gvc directory"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\.gvcignore.toml"}
-{"level":"info","message":"Hash generated for file: .gvcignore.toml hash: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"}
-{"level":"error","module":"database","error":"database not open","message":"Error finding file by path"}
-{"level":"error","module":"database","error":"database not open","message":"Error initialising file in database"}
-{"level":"error","message":"Error checking if file [.gvcignore.toml] is monitored. Error database not open"}
-{"level":"info","message":"No files found that could be added to tracked"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Adding all files..."}
-{"level":"info","message":"skipping .gvc directory"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\.gvcignore.toml"}
-{"level":"info","message":"Hash generated for file: .gvcignore.toml hash: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"}
-{"level":"error","module":"database","error":"database not open","message":"Error finding file by path"}
-{"level":"error","module":"database","error":"database not open","message":"Error initialising file in database"}
-{"level":"error","message":"Error checking if file [.gvcignore.toml] is monitored. Error database not open"}
-{"level":"info","message":"No files found that could be added to tracked"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Adding all files..."}
-{"level":"info","message":"skipping .gvc directory"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\.gvcignore.toml"}
-{"level":"info","message":"Hash generated for file: .gvcignore.toml hash: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"}
-{"level":"error","module":"database","error":"database not open","message":"Error initialising file in database"}
-{"level":"error","message":"Error checking if file [.gvcignore.toml] is monitored. Error database not open"}
-{"level":"info","message":"No files found that could be added to tracked"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Adding all files..."}
-{"level":"info","message":"skipping .gvc directory"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\.gvcignore.toml"}
-{"level":"info","message":"Hash generated for file: .gvcignore.toml hash: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"}
-{"level":"error","module":"database","error":"database not open","message":"Error initialising file in database"}
-{"level":"error","message":"Error checking if file [.gvcignore.toml] is monitored. Error database not open"}
-{"level":"info","message":"No files found that could be added to tracked"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Adding all files..."}
-{"level":"info","message":"skipping .gvc directory"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\.gvcignore.toml"}
-{"level":"info","message":"Hash generated for file: .gvcignore.toml hash: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"}
-{"level":"warn","module":"database","message":"no file found"}
-{"level":"info","message":"added file: .gvcignore.toml at path: .gvcignore.toml with hash: \ufffd\ufffd\ufffdB\ufffd\ufffd\u001c\u0014\ufffd\ufffd\ufffdșo\ufffd$'\ufffdA\ufffdd\ufffd\ufffdL\ufffd\ufffd\ufffd\u001bxR\ufffdU at time: %!s(func() string=0x68d650)"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\client.go"}
-{"level":"info","message":"Hash generated for file: client.go hash: 6d359e70bc1c2ac552e59834b70b4869b17afd546a4e2d8a80c2dc628f0bba1c"}
-{"level":"warn","module":"database","message":"no file found"}
-{"level":"info","message":"added file: client.go at path: client.go with hash: m5\ufffdp\ufffd\u001c*\ufffdR\ufffd\ufffd4\ufffd\u000bHi\ufffdz\ufffdTjN-\ufffd\ufffd\ufffd\ufffdb\ufffd\u000b\ufffd\u001c at time: %!s(func() string=0x68d650)"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\clientcmd"}
-{"level":"info","message":"Adding the following files to tracked: [.gvcignore.toml client.go]"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Adding all files..."}
-{"level":"info","message":"skipping .gvc directory"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\.gvcignore.toml"}
-{"level":"info","message":"Hash generated for file: .gvcignore.toml hash: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"}
-{"level":"error","module":"database","error":"database not open","message":"Error finding file by path"}
-{"level":"error","module":"database","error":"database not open","message":"Error initialising file in database"}
-{"level":"error","message":"Error checking if file [.gvcignore.toml] is monitored. Error database not open"}
-{"level":"info","message":"No files found that could be added to tracked"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Adding all files..."}
-{"level":"info","message":"skipping .gvc directory"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\.gvcignore.toml"}
-{"level":"info","message":"Hash generated for file: .gvcignore.toml hash: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"}
-{"level":"info","message":"No files found that could be added to tracked"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","module":"database","message":"Fetching last commit on branch: "}
-{"level":"error","module":"database","error":"not found","message":"Failed to find last commit on branch: "}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Adding all files..."}
-{"level":"info","message":"skipping .gvc directory"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\.gvcignore.toml"}
-{"level":"info","message":"Hash generated for file: .gvcignore.toml hash: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"}
-{"level":"info","message":"No files found that could be added to tracked"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","module":"database","message":"Fetching last commit on branch: "}
-{"level":"error","module":"database","error":"not found","message":"Failed to find last commit on branch: "}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","module":"database","message":"Fetching last commit on branch: "}
-{"level":"error","module":"database","error":"not found","message":"Failed to find last commit on branch: "}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","module":"database","message":"Fetching last commit on branch: "}
-{"level":"error","module":"database","error":"not found","message":"Failed to find last commit on branch: "}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Creating new Manager..."}
 {"level":"info","module":"database","message":"Fetching last commit on branch: master"}
-{"level":"error","module":"database","error":"not found","message":"Failed to find last commit on branch: master"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Adding all files..."}
-{"level":"info","message":"skipping .gvc directory"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\.gvcignore.toml"}
-{"level":"info","message":"Hash generated for file: .gvcignore.toml hash: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"}
-{"level":"info","message":"No files found that could be added to tracked"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Adding all files..."}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client"}
-{"level":"info","message":"No files found that could be added to tracked"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Adding all files..."}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client"}
-{"level":"info","message":"No files found that could be added to tracked"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Adding all files..."}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client"}
-{"level":"info","message":"No files found that could be added to tracked"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Adding all files..."}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client"}
-{"level":"info","message":"No files found that could be added to tracked"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Adding all files..."}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client"}
-{"level":"info","message":"No files found that could be added to tracked"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Adding all files..."}
-{"level":"info","message":"skipping .gvc directory"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\.gvcignore.toml"}
-{"level":"info","message":"Hash generated for file: .gvcignore.toml hash: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"}
-{"level":"warn","module":"database","message":".gvcignore.toml not found in tracked database"}
-{"level":"error","module":"database","error":"already exists","message":"Error initialising file in database"}
-{"level":"error","message":"Error checking if file [.gvcignore.toml] is monitored. Error already exists"}
-{"level":"info","message":"No files found that could be added to tracked"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","message":"Adding all files..."}
-{"level":"info","message":"skipping .gvc directory"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\.gvcignore.toml"}
-{"level":"info","message":"Hash generated for file: .gvcignore.toml hash: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"}
-{"level":"warn","module":"database","message":".gvcignore.toml not found in tracked database"}
-{"level":"error","module":"database","error":"already exists","message":"Error initialising file in database"}
-{"level":"error","message":"Error checking if file [.gvcignore.toml] is monitored. Error already exists"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\client.go"}
-{"level":"info","message":"Hash generated for file: client.go hash: 9755c697fe67f719fb20de90e511ad653607249fdb4f3c5c0857b6841372bc59"}
-{"level":"warn","module":"database","message":"client.go not found in tracked database"}
-{"level":"info","message":"added file: client.go at path: client.go with hash: \ufffdUƗ\ufffdg\ufffd\u0019\ufffd ސ\ufffd\u0011\ufffde6\u0007$\ufffd\ufffdO<\\\bW\ufffd\ufffd\u0013r\ufffdY at time: %!s(func() string=0x68d580)"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\clientcmd"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\clientcmd\\add.go"}
-{"level":"info","message":"Hash generated for file: clientcmd\\add.go hash: c2da32538629512f829f58a0ce336b6879b2f7b0f163f075eca586170f15525d"}
-{"level":"warn","module":"database","message":"clientcmd\\add.go not found in tracked database"}
-{"level":"info","message":"added file: add.go at path: clientcmd\\add.go with hash: \ufffd\ufffd2S\ufffd)Q/\ufffd\ufffdX\ufffd\ufffd3khy\ufffd\ufffd\ufffd\ufffdc\ufffdu쥆\u0017\u000f\u0015R] at time: %!s(func() string=0x68d580)"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\clientcmd\\branch.go"}
-{"level":"info","message":"Hash generated for file: clientcmd\\branch.go hash: 3253216a630e370735a7d9f4f492019b773f3675c4352c589a66b31ee1ca0296"}
-{"level":"warn","module":"database","message":"clientcmd\\branch.go not found in tracked database"}
-{"level":"info","message":"added file: branch.go at path: clientcmd\\branch.go with hash: 2S!jc\u000e7\u00075\ufffd\ufffd\ufffd\ufffd\ufffd\u0001\ufffdw?6u\ufffd5,X\ufffdf\ufffd\u001e\ufffd\ufffd\u0002\ufffd at time: %!s(func() string=0x68d580)"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\clientcmd\\commit.go"}
-{"level":"info","message":"Hash generated for file: clientcmd\\commit.go hash: 8b2d9937127a1f025e70f4ea7090fa5a2afed98b4e195419687b4b0987cbaeb2"}
-{"level":"warn","module":"database","message":"clientcmd\\commit.go not found in tracked database"}
-{"level":"info","message":"added file: commit.go at path: clientcmd\\commit.go with hash: \ufffd-\ufffd7\u0012z\u001f\u0002^p\ufffd\ufffdp\ufffd\ufffdZ*\ufffdًN\u0019T\u0019h{K\t\ufffdˮ\ufffd at time: %!s(func() string=0x68d580)"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\clientcmd\\commonlib.go"}
-{"level":"info","message":"Hash generated for file: clientcmd\\commonlib.go hash: 06af11edbda73ba1d5f067e024df3b7a582739d9ed351800eeb8ac57efd841b5"}
-{"level":"warn","module":"database","message":"clientcmd\\commonlib.go not found in tracked database"}
-{"level":"info","message":"added file: commonlib.go at path: clientcmd\\commonlib.go with hash: \u0006\ufffd\u0011\ufffd\ufffd\ufffd;\ufffd\ufffd\ufffdg\ufffd$\ufffd;zX'9\ufffd\ufffd5\u0018\u0000W\ufffd\ufffdA\ufffd at time: %!s(func() string=0x68d580)"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\clientcmd\\ignore.go"}
-{"level":"info","message":"Hash generated for file: clientcmd\\ignore.go hash: e3909b8e797bc09e51e96faf22bd498ec5e707353a791fb0f82601963a9bedba"}
-{"level":"warn","module":"database","message":"clientcmd\\ignore.go not found in tracked database"}
-{"level":"info","message":"added file: ignore.go at path: clientcmd\\ignore.go with hash: 㐛\ufffdy{\ufffd\ufffdQ\ufffdo\ufffd\"\ufffdI\ufffd\ufffd\ufffd\u00075:y\u001f\ufffd\ufffd&\u0001\ufffd:\ufffd\ufffd\ufffd at time: %!s(func() string=0x68d580)"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\clientcmd\\info.go"}
-{"level":"info","message":"Hash generated for file: clientcmd\\info.go hash: e36d6acc511b7df37f65800ca44fee248b1e4ac3e4d721caaeedb108fdd5b911"}
-{"level":"warn","module":"database","message":"clientcmd\\info.go not found in tracked database"}
-{"level":"info","message":"added file: info.go at path: clientcmd\\info.go with hash: \ufffdmj\ufffdQ\u001b}\ufffd\u007fe\ufffd\f\ufffdO\ufffd$\ufffd\u001eJ\ufffd\ufffd\ufffd!ʮ\ufffd\ufffd\b\ufffdչ\u0011 at time: %!s(func() string=0x68d580)"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\clientcmd\\init.go"}
-{"level":"info","message":"Hash generated for file: clientcmd\\init.go hash: 32fe445bddcdfa8ee1c7d18b60b04bef3fba013d99ea21bcfecab7323e548c12"}
-{"level":"warn","module":"database","message":"clientcmd\\init.go not found in tracked database"}
-{"level":"info","message":"added file: init.go at path: clientcmd\\init.go with hash: 2\ufffdD[\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdы`\ufffdK\ufffd?\ufffd\u0001=\ufffd\ufffd!\ufffd\ufffdʷ2>T\ufffd\u0012 at time: %!s(func() string=0x68d580)"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\clientcmd\\lock.go"}
-{"level":"info","message":"Hash generated for file: clientcmd\\lock.go hash: fed0c794edd5021894feccd43fb174345ff402c5173cc88f80f17e157fa0d3b7"}
-{"level":"warn","module":"database","message":"clientcmd\\lock.go not found in tracked database"}
-{"level":"info","message":"added file: lock.go at path: clientcmd\\lock.go with hash: \ufffd\ufffdǔ\ufffd\ufffd\u0002\u0018\ufffd\ufffd\ufffd\ufffd?\ufffdt4_\ufffd\u0002\ufffd\u0017<ȏ\ufffd\ufffd~\u0015\u007f\ufffdӷ at time: %!s(func() string=0x68d580)"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\clientcmd\\refresh.go"}
-{"level":"info","message":"Hash generated for file: clientcmd\\refresh.go hash: ea80c045b05e3a63b219b2e0db6bd324fc078e67ffdb670929b2dd3ef72d91ad"}
-{"level":"warn","module":"database","message":"clientcmd\\refresh.go not found in tracked database"}
-{"level":"info","message":"added file: refresh.go at path: clientcmd\\refresh.go with hash: \ufffd\ufffd\ufffdE\ufffd^:c\ufffd\u0019\ufffd\ufffd\ufffdk\ufffd$\ufffd\u0007\ufffdg\ufffd\ufffdg\t)\ufffd\ufffd>\ufffd-\ufffd\ufffd at time: %!s(func() string=0x68d580)"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\clientcmd\\remote.go"}
-{"level":"info","message":"Hash generated for file: clientcmd\\remote.go hash: 4efc3f749ac533188374f8f1e32fff9f60f6f32e7b5f2a788bdd42367916e5dd"}
-{"level":"warn","module":"database","message":"clientcmd\\remote.go not found in tracked database"}
-{"level":"info","message":"added file: remote.go at path: clientcmd\\remote.go with hash: N\ufffd?t\ufffd\ufffd3\u0018\ufffdt\ufffd\ufffd\ufffd/\ufffd\ufffd`\ufffd\ufffd.{_*x\ufffd\ufffdB6y\u0016\ufffd\ufffd at time: %!s(func() string=0x68d580)"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\clientcmd\\switch.go"}
-{"level":"info","message":"Hash generated for file: clientcmd\\switch.go hash: 68876bd199dc8e35be2cab865a4c40625c0788b14fdf9ba5741c6b3478c55f58"}
-{"level":"warn","module":"database","message":"clientcmd\\switch.go not found in tracked database"}
-{"level":"info","message":"added file: switch.go at path: clientcmd\\switch.go with hash: h\ufffdkљ܎5\ufffd,\ufffd\ufffdZL@b\\\u0007\ufffd\ufffdOߛ\ufffdt\u001ck4x\ufffd_X at time: %!s(func() string=0x68d580)"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\clientconfig"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\clientconfig\\config.go"}
-{"level":"info","message":"Hash generated for file: clientconfig\\config.go hash: 18b64cc522732723dc9becaf7b074af9adb4085e05568d90cb117187ce388c97"}
-{"level":"warn","module":"database","message":"clientconfig\\config.go not found in tracked database"}
-{"level":"info","message":"added file: config.go at path: clientconfig\\config.go with hash: \u0018\ufffdL\ufffd\"s'#ܛ\ufffd\ufffd{\u0007J\ufffd\ufffd\ufffd\b^\u0005V\ufffd\ufffd\ufffd\u0011q\ufffd\ufffd8\ufffd\ufffd at time: %!s(func() string=0x68d580)"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\clientconfig\\structures.go"}
-{"level":"info","message":"Hash generated for file: clientconfig\\structures.go hash: 95caca8d32844a2ca82d071eb487df5b253c1b495ae558b26455d14a4797e062"}
-{"level":"warn","module":"database","message":"clientconfig\\structures.go not found in tracked database"}
-{"level":"info","message":"added file: structures.go at path: clientconfig\\structures.go with hash: \ufffd\ufffdʍ2\ufffdJ,\ufffd-\u0007\u001e\ufffd\ufffd\ufffd[%<\u001bIZ\ufffdX\ufffddU\ufffdJG\ufffd\ufffdb at time: %!s(func() string=0x68d580)"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\test"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\test\\test.go.old"}
-{"level":"info","message":"Hash generated for file: test\\test.go.old hash: 0342f4965b2e42d610ca0c4efe58fe1d3f5b7a48deba94323d69ed7c2412161f"}
-{"level":"warn","module":"database","message":"test\\test.go.old not found in tracked database"}
-{"level":"info","message":"added file: test.go.old at path: test\\test.go.old with hash: \u0003B\ufffd\ufffd[.B\ufffd\u0010\ufffd\fN\ufffdX\ufffd\u001d?[zH޺\ufffd2=i\ufffd|$\u0012\u0016\u001f at time: %!s(func() string=0x68d580)"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\test\\test2.go"}
-{"level":"info","message":"Hash generated for file: test\\test2.go hash: 71afb737f43158c15d99af3037c6497f362d08ed199cf4a2b602da380a904c52"}
-{"level":"warn","module":"database","message":"test\\test2.go not found in tracked database"}
-{"level":"info","message":"added file: test2.go at path: test\\test2.go with hash: q\ufffd\ufffd7\ufffd1X\ufffd]\ufffd\ufffd07\ufffdI\u007f6-\b\ufffd\u0019\ufffd\ufffd\ufffd\ufffd\u0002\ufffd8\n\ufffdLR at time: %!s(func() string=0x68d580)"}
-{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\test.go"}
-{"level":"info","message":"Hash generated for file: test.go hash: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"}
-{"level":"warn","module":"database","message":"test.go not found in tracked database"}
-{"level":"error","module":"database","error":"already exists","message":"Error initialising file in database"}
-{"level":"error","message":"Error checking if file [test.go] is monitored. Error already exists"}
-{"level":"info","message":"Adding the following files to tracked: [client.go clientcmd\\add.go clientcmd\\branch.go clientcmd\\commit.go clientcmd\\commonlib.go clientcmd\\ignore.go clientcmd\\info.go clientcmd\\init.go clientcmd\\lock.go clientcmd\\refresh.go clientcmd\\remote.go clientcmd\\switch.go clientconfig\\config.go clientconfig\\structures.go test\\test.go.old test\\test2.go]"}
 {"level":"info","message":"Creating new Manager..."}
 {"level":"info","module":"database","message":"Fetching last commit on branch: master"}
-{"level":"error","module":"database","error":"not found","message":"Failed to find last commit on branch: master"}
+{"level":"info","module":"database","message":"Last commit was of number: 1 Last Commit Hash was: E\ufffd\ufffd>\ufffd\ufffd˵\ufffd\u0012V\ufffd\ufffdϟw\ufffd`#,FU(\ufffd\ufffdQ\ufffd}\ufffd1 \ufffd Last commit occurred on date: 2020-07-06 14:50:09.4015985 -0400 EDT m=+0.027025401"}
 {"level":"info","message":"Creating new Manager..."}
 {"level":"info","module":"database","message":"Fetching last commit on branch: master"}
-{"level":"error","module":"database","error":"not found","message":"Failed to find last commit on branch: master"}
+{"level":"info","module":"database","message":"Last commit was of number: 1 Last Commit Hash was: 45d0ec3eabe1cbb5901256d0cecf9f779460232c465528a1d351987d8f31208b Last commit occurred on date: 2020-07-06 14:50:09.4015985 -0400 EDT m=+0.027025401"}
 {"level":"info","message":"Creating new Manager..."}
 {"level":"info","module":"database","message":"Fetching last commit on branch: master"}
-{"level":"error","module":"database","error":"not found","message":"Failed to find last commit on branch: master"}
-{"level":"info","message":"unable to fetch last commit on branch, assuming first commit on branch%!(EXTRA *errors.errorString=not found)"}
-{"level":"info","message":"Starting initial commit on branch: test commit"}
+{"level":"info","module":"database","message":"Last commit was of number: 1 Last Commit Hash was: 45d0ec3eabe1cbb5901256d0cecf9f779460232c465528a1d351987d8f31208b Last commit occurred on date: 2020-07-06 14:50:09.4015985 -0400 EDT m=+0.027025401"}
 {"level":"info","message":"Creating new Manager..."}
 {"level":"info","module":"database","message":"Fetching last commit on branch: master"}
-{"level":"error","module":"database","error":"not found","message":"Failed to find last commit on branch: master"}
-{"level":"info","message":"unable to fetch last commit on branch, assuming first commit on branch%!(EXTRA *errors.errorString=not found)"}
-{"level":"info","message":"Starting initial commit on branch: test commit"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","module":"database","message":"Fetching last commit on branch: master"}
-{"level":"error","module":"database","error":"not found","message":"Failed to find last commit on branch: master"}
-{"level":"info","message":"unable to fetch last commit on branch, assuming first commit on branch%!(EXTRA *errors.errorString=not found)"}
-{"level":"info","message":"Starting initial commit on branch: master"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","module":"database","message":"Fetching last commit on branch: master"}
-{"level":"error","module":"database","error":"not found","message":"Failed to find last commit on branch: master"}
-{"level":"info","message":"unable to fetch last commit on branch, assuming first commit on branch%!(EXTRA *errors.errorString=not found)"}
-{"level":"info","message":"Starting initial commit on branch: master"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","module":"database","message":"Fetching last commit on branch: master"}
-{"level":"error","module":"database","error":"not found","message":"Failed to find last commit on branch: master"}
-{"level":"info","message":"unable to fetch last commit on branch, assuming first commit on branch%!(EXTRA *errors.errorString=not found)"}
-{"level":"info","message":"Starting initial commit on branch: master"}
+{"level":"info","module":"database","message":"Last commit was of number: 1 Last Commit Hash was: 45d0ec3eabe1cbb5901256d0cecf9f779460232c465528a1d351987d8f31208b Last commit occurred on date: 2020-07-06 14:50:09.4015985 -0400 EDT m=+0.027025401"}
+{"level":"info","message":"Starting commit number: %!s(int=2) on branch: master"}
 {"level":"info","message":"Total number of files to commit: %!s(int=16)"}
-{"level":"info","module":"database","message":"Writing new commit: %!s(int=1) on branch: master"}
-{"level":"error","module":"database","error":"provided target must be a pointer to struct","message":"failure to write commit to database"}
-{"level":"error","error":"provided target must be a pointer to struct","message":"unable to create initial commit: provided target must be a pointer to struct"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","module":"database","message":"Fetching last commit on branch: master"}
-{"level":"error","module":"database","error":"not found","message":"Failed to find last commit on branch: master"}
-{"level":"info","message":"unable to fetch last commit on branch, assuming first commit on branch%!(EXTRA *errors.errorString=not found)"}
-{"level":"info","message":"Starting initial commit on branch: master"}
-{"level":"info","message":"Total number of files to commit: %!s(int=16)"}
-{"level":"info","module":"database","message":"Writing new commit: %!s(int=1) on branch: master"}
-{"level":"error","module":"database","error":"missing struct tag id or ID field","message":"failure to write commit to database"}
-{"level":"error","error":"missing struct tag id or ID field","message":"unable to create initial commit: missing struct tag id or ID field"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","module":"database","message":"Fetching last commit on branch: master"}
-{"level":"error","module":"database","error":"not found","message":"Failed to find last commit on branch: master"}
-{"level":"info","message":"unable to fetch last commit on branch, assuming first commit on branch%!(EXTRA *errors.errorString=not found)"}
-{"level":"info","message":"Starting initial commit on branch: master"}
-{"level":"info","message":"Total number of files to commit: %!s(int=16)"}
-{"level":"info","module":"database","message":"Writing new commit: %!s(int=1) on branch: master"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","module":"database","message":"Fetching last commit on branch: master"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","module":"database","message":"Fetching last commit on branch: master"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","module":"database","message":"Fetching last commit on branch: master"}
-{"level":"info","message":"Creating new Manager..."}
-{"level":"info","module":"database","message":"Fetching last commit on branch: master"}
diff --git a/client/client.exe b/client/client.exe
new file mode 100644
index 0000000..9ffabd9
Binary files /dev/null and b/client/client.exe differ
diff --git a/common/database/db-ops.go b/common/database/db-ops.go
index 292a849..f443314 100644
--- a/common/database/db-ops.go
+++ b/common/database/db-ops.go
@@ -1,6 +1,7 @@
 package database
 
 import (
+	"encoding/hex"
 	"fmt"
 
 	"github.com/asdine/storm/q"
@@ -200,6 +201,7 @@ func (db *DB) FetchLastCommitOnBranch(branch string) (commitResult Commit, err e
 		db.Err(err).Msgf("Failed to find last commit on branch: %s", branch)
 		return commit, err
 	}
+	db.Info().Msgf("Last commit was of number: %d Last Commit Hash was: %s Last commit occurred on date: %s", commit.Number, hex.EncodeToString(commit.CommitHash), commit.Date)
 	return commit, nil
 }
 
diff --git a/common/engine/commits.go b/common/engine/commits.go
index d9a33fc..a4aa7af 100644
--- a/common/engine/commits.go
+++ b/common/engine/commits.go
@@ -49,3 +49,46 @@ func (m *Manager) CreateInitialCommit(fileList []database.File, branch string, c
 	return nil
 
 }
+
+// CreateCommit creates a new commit by running diffs on files, compressing, etc, as needed
+func (m *Manager) CreateCommit(changedFiles []database.File, trackedFiles []database.File, branch string, commitMessage string, commitNumber int) error {
+	m.Info().Msgf("Starting commit number: %d on branch: %s", commitNumber, branch)
+	//Need to deduplicate so we aren't storing duplicates of files, storing all the files in one folder won't work, will need something like git
+	//For initial commit no changes are made to files, so don't store anything, just save the list so you can send to server
+	var newCommit database.Commit
+	newCommit.Branch = "master"
+	hashBytes, err := CreateCommitHash(trackedFiles, commitMessage)
+	if err != nil {
+		return err
+	}
+	currentTime := time.Now()
+	newCommit.CommitHash = hashBytes
+	newCommit.Number = 1
+	newCommit.TrackedFiles = trackedFiles
+	newCommit.Date = currentTime.String()
+	folder := m.FilePaths.ObjectFolder + string(filepath.Separator) + hex.EncodeToString(hashBytes)
+	err = os.Mkdir(folder, 0666)
+	if err != nil {
+		return fmt.Errorf("unable to create commit directory in object dir: %s err: %s", folder, err)
+	}
+	m.Info().Msgf("Total number of files to commit: %d", len(trackedFiles))
+	fmt.Println("Total number of files to commit: ", len(trackedFiles))
+	// TODO: CHeck for NEW Files and convert to starage, not changed files
+	for _, file := range changedFiles {
+		m.Info().Msgf("Converting changed fi")
+		filename, err := ConvertFileForStorage(&file, folder)
+		if err != nil {
+			// TODO: roll back commit on error (folders/files created need to be deleted)
+			return err
+		}
+		file.BaseFilePath = filename
+	}
+	// TODO: THis needs to be the delta calculation for changed files
+	err = m.dB.NewCommit(newCommit, branch)
+	if err != nil {
+		return err
+	}
+	//var hashList [][]byte
+	return nil
+
+}
diff --git a/common/engine/manager.go b/common/engine/manager.go
index 3a7c9d8..1eb9116 100644
--- a/common/engine/manager.go
+++ b/common/engine/manager.go
@@ -220,8 +220,10 @@ func (m *Manager) BeginCommit(branch string, commitMessage string) error {
 			m.Err(err).Msgf("unable to create initial commit: %s", err)
 			return err
 		}
+		m.Info().Msgf("Initial Commit Created, returning...")
+		return nil
 	}
-	var filesToDiff []database.File // Contains the list of files that have changed
+	var filesToDiff []database.File // Contains the list of files that have changed since the initial commit
 	for _, trackedFile := range trackedFiles {
 		fmt.Println("Working on file: ", trackedFile.Path)
 		if trackedFile.Path == "" {
@@ -253,7 +255,12 @@ func (m *Manager) BeginCommit(branch string, commitMessage string) error {
 		m.Info().Msgf("No changed files found to commit on branch: %s", branch)
 		return fmt.Errorf("no changed files, cannot commit on branch: %s", branch)
 	}
-	fmt.Println("COMMIT: ", commit.CommitHash)
+	fmt.Println("COMMIT: ", hex.EncodeToString(commit.CommitHash))
+	newCommitNumber := commit.Number + 1
+	err = m.CreateCommit(filesToDiff, trackedFiles, branch, commitMessage, newCommitNumber)
+	if err != nil {
+		return err
+	}
 	return nil
 }