diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
new file mode 100644
index 00000000..51c16a88
--- /dev/null
+++ b/.github/workflows/actions.yml
@@ -0,0 +1,38 @@
+name: First Git Actions
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+
+      - name: Build and run tests with JaCoCo
+        run: ./gradlew clean build jacocoTestReport --stacktrace
+
+      - name: SonarCloud Scan
+        uses: sonarsource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+
+          
+#      - name: Upload test reports
+#        uses: actions/upload-artifact@v2
+#        with:
+#          name: test-reports
+#          path: build/test-results/test
+#
+#      - name: Upload code coverage report
+#        uses: actions/upload-artifact@v2
+#        with:
+#          name: coverage-report
+#          path: build/reports/coverage/report.csv
\ No newline at end of file
diff --git a/.run/codesync-intellij [publishPlugin].run.xml b/.run/3- codesync-intellij [publishPlugin].run.xml
similarity index 97%
rename from .run/codesync-intellij [publishPlugin].run.xml
rename to .run/3- codesync-intellij [publishPlugin].run.xml
index 1290b521..d3f09903 100644
--- a/.run/codesync-intellij [publishPlugin].run.xml	
+++ b/.run/3- codesync-intellij [publishPlugin].run.xml	
@@ -3,7 +3,7 @@
     <ExternalSystemSettings>
       <option name="env">
         <map>
-          <entry key="ORG_GRADLE_PROJECT_intellijPublishToken" value="perm:{add-key-here}" />
+          <entry key="ORG_GRADLE_PROJECT_intellijPublishToken" value="" />
         </map>
       </option>
       <option name="executionName" />
diff --git a/build.gradle b/build.gradle
index 34939606..40a145ea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,6 +4,7 @@ plugins {
   id 'java'
   id 'org.jetbrains.intellij' version '0.6.5'
   id("org.jetbrains.kotlin.jvm") version "1.8.0"
+  id 'jacoco'
 }
 
 group 'com.codesync'
@@ -33,6 +34,13 @@ patchPluginXml {
   untilBuild = '231.*'
 }
 
+jacocoTestReport {
+  reports {
+    csv.enabled true
+    csv.destination file("$buildDir/reports/coverage/report.csv")
+  }
+}
+
 dependencies {
   implementation files('libs/diff_match_patch.jar')
   implementation files('libs/gitignore-file-filter-1.0.0.jar')
@@ -58,6 +66,9 @@ dependencies {
     exclude group: 'org.slf4j'
   }
 
+  // https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc
+  implementation group: 'org.xerial', name: 'sqlite-jdbc', version: '3.40.0.0'
+
   implementation 'org.eclipse.jetty:jetty-server:9.4.3.v20170317'
   implementation 'org.eclipse.jetty:jetty-servlet:9.4.3.v20170317'
 
diff --git a/src/main/.syncignore b/src/main/.syncignore
new file mode 100644
index 00000000..e69de29b
diff --git a/src/main/java/org/intellij/sdk/codesync/CodeSyncLogger.java b/src/main/java/org/intellij/sdk/codesync/CodeSyncLogger.java
index bd778af4..f5b86227 100644
--- a/src/main/java/org/intellij/sdk/codesync/CodeSyncLogger.java
+++ b/src/main/java/org/intellij/sdk/codesync/CodeSyncLogger.java
@@ -11,7 +11,7 @@
 import software.amazon.awssdk.services.cloudwatchlogs.model.*;
 
 import org.intellij.sdk.codesync.exceptions.InvalidYmlFileError;
-import org.intellij.sdk.codesync.files.UserFile;
+import org.intellij.sdk.codesync.models.UserAccount;
 import static org.intellij.sdk.codesync.Constants.*;
 
 import java.io.FileNotFoundException;
@@ -114,26 +114,19 @@ private static void logEvent(String message, String type) {
         logEvent(message, null, type);
     }
 
-    private static void logEvent(String message, String userEmail, String type) {
-        UserFile.User user = null;
-        UserFile userFile = null;
+    public static void logEvent(String message, String userEmail, String type) {
+        UserAccount userAccount = new UserAccount();
         logConsoleMessage(message, type);
 
-        try {
-            userFile = new UserFile(USER_FILE_PATH);
-        } catch (FileNotFoundException | InvalidYmlFileError e) {
-            e.printStackTrace();
-        }
-
-        if (userEmail != null && userFile != null) {
-            user = userFile.getUser(userEmail);
-        } else if (userFile != null) {
-            user = userFile.getActiveUser();
+        if (userEmail != null && userAccount != null) {
+            userAccount = userAccount.getUser(userEmail);
+        } else if (userAccount != null) {
+            userAccount = userAccount.getActiveUser();
         }
 
         String streamName, accessKey, secretKey;
 
-        if (user == null || user.getAccessKey() == null || user.getSecretKey() == null || user.getUserEmail() == null) {
+        if (userAccount == null || userAccount.getAccessKey() == null || userAccount.getSecretKey() == null || userAccount.getUserEmail() == null) {
             //Log with the plugin user.
             streamName = PLUGIN_USER_LOG_STREAM;
             if (PLUGIN_USER_ACCESS_KEY == null || PLUGIN_USER_SECRET_KEY == null) {
@@ -145,9 +138,9 @@ private static void logEvent(String message, String userEmail, String type) {
                 secretKey = PLUGIN_USER_SECRET_KEY;
             }
         } else {
-            streamName = user.getUserEmail();
-            accessKey = user.getAccessKey();
-            secretKey = user.getSecretKey();
+            streamName = userAccount.getUserEmail();
+            accessKey = userAccount.getAccessKey();
+            secretKey = userAccount.getSecretKey();
         }
 
         try {
diff --git a/src/main/java/org/intellij/sdk/codesync/Constants.java b/src/main/java/org/intellij/sdk/codesync/Constants.java
index ba889edc..5485fc88 100644
--- a/src/main/java/org/intellij/sdk/codesync/Constants.java
+++ b/src/main/java/org/intellij/sdk/codesync/Constants.java
@@ -32,6 +32,8 @@ private Constants() {
     public static final String DELETED_REPO = Paths.get(CODESYNC_ROOT, ".deleted").toString();
     public static final String SHADOW_REPO = Paths.get(CODESYNC_ROOT, ".shadow").toString();
     public static final String CONFIG_PATH = Paths.get(CODESYNC_ROOT, "config.yml").toString();
+
+    //TODO: User file will be removed
     public static final String USER_FILE_PATH = Paths.get(CODESYNC_ROOT, "user.yml").toString();
     public static final String ALERTS_FILE_PATH = Paths.get(CODESYNC_ROOT, "alerts.yml").toString();
     public static final String SEQUENCE_TOKEN_FILE_PATH = Paths.get(CODESYNC_ROOT, "sequence_token.yml").toString();
@@ -45,6 +47,10 @@ private Constants() {
     public static final Integer DELAY_BETWEEN_ACTIVITY_ALERT_TASKS = 10 * 60 * 1000; // 10 minutes wait.
     public static final Integer DELAY_BETWEEN_BUFFER_TASKS_IN_SECONDS = 5;
 
+    //Database queries and strings
+    public static final String DATABASE_PATH = Paths.get(CODESYNC_ROOT, "codesyncdb.db").toString();
+    public static final String CONNECTION_STRING = "jdbc:sqlite:" + DATABASE_PATH;
+
     public static final String DEFAULT_TIMEZONE = ZoneId.systemDefault().getId();
     public static final String DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS z";
     public static final String DATE_FORMAT = "yyyy-MM-dd";
diff --git a/src/main/java/org/intellij/sdk/codesync/HandleBuffer.java b/src/main/java/org/intellij/sdk/codesync/HandleBuffer.java
index a1fca822..aba6c2bf 100644
--- a/src/main/java/org/intellij/sdk/codesync/HandleBuffer.java
+++ b/src/main/java/org/intellij/sdk/codesync/HandleBuffer.java
@@ -6,7 +6,7 @@
 import org.intellij.sdk.codesync.clients.CodeSyncWebSocketClient;
 import org.intellij.sdk.codesync.exceptions.*;
 import org.intellij.sdk.codesync.files.*;
-import org.intellij.sdk.codesync.locks.CodeSyncLock;
+import org.intellij.sdk.codesync.models.UserAccount;
 import org.intellij.sdk.codesync.repoManagers.DeletedRepoManager;
 import org.intellij.sdk.codesync.repoManagers.OriginalsRepoManager;
 import org.intellij.sdk.codesync.repoManagers.ShadowRepoManager;
@@ -208,7 +208,7 @@ public static void handleBuffer(Project project) {
             }
 
             ConfigRepo configRepo = configFile.getRepo(diffFile.repoPath);
-            String accessToken = UserFile.getAccessToken(configRepo.email);
+            String accessToken = UserAccount.getAccessToken(configRepo.email);
 
             if (accessToken == null) {
                 CodeSyncLogger.critical(String.format(
@@ -355,7 +355,7 @@ public static void handleBuffer(Project project) {
         // Send Diffs in a single request.
 
         ConfigRepo configRepo = configFile.getRepo(currentRepo);
-        String accessToken = UserFile.getAccessToken(configRepo.email);
+        String accessToken = UserAccount.getAccessToken(configRepo.email);
         if (accessToken ==  null) {
             CodeSyncLogger.warning(String.format(
                     "Access token for user '%s' not present so skipping diffs for repo '%s'.",
diff --git a/src/main/java/org/intellij/sdk/codesync/PopulateBuffer.java b/src/main/java/org/intellij/sdk/codesync/PopulateBuffer.java
index 06039ee6..4d94ec1d 100644
--- a/src/main/java/org/intellij/sdk/codesync/PopulateBuffer.java
+++ b/src/main/java/org/intellij/sdk/codesync/PopulateBuffer.java
@@ -6,12 +6,11 @@
 import org.intellij.sdk.codesync.codeSyncSetup.CodeSyncSetup;
 import org.intellij.sdk.codesync.exceptions.FileInfoError;
 import org.intellij.sdk.codesync.exceptions.InvalidConfigFileError;
-import org.intellij.sdk.codesync.exceptions.InvalidYmlFileError;
 import org.intellij.sdk.codesync.factories.DiffFactory;
 import org.intellij.sdk.codesync.files.ConfigFile;
 import org.intellij.sdk.codesync.files.ConfigRepo;
 import org.intellij.sdk.codesync.files.ConfigRepoBranch;
-import org.intellij.sdk.codesync.files.UserFile;
+import org.intellij.sdk.codesync.models.UserAccount;
 import org.intellij.sdk.codesync.repoManagers.DeletedRepoManager;
 import org.intellij.sdk.codesync.repoManagers.OriginalsRepoManager;
 import org.intellij.sdk.codesync.repoManagers.ShadowRepoManager;
@@ -20,7 +19,6 @@
 import static org.intellij.sdk.codesync.Constants.*;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
@@ -167,16 +165,8 @@ public static Map<String, String> detectBranchChange() {
             return reposToUpdate;
         }
         Map<String, ConfigRepo> configRepoMap = configFile.getRepos();
-        UserFile userFile;
-
-        try {
-            userFile = new UserFile(USER_FILE_PATH);
-        } catch (FileNotFoundException | InvalidYmlFileError error) {
-            CodeSyncLogger.critical(String.format(
-                    "[POPULATE_BUFFER] User file error, %s.\n", error.getMessage()
-            ));
-            return reposToUpdate;
-        }
+        UserAccount userAccount;
+        userAccount = new UserAccount();
 
         for (Map.Entry<String, ConfigRepo> configRepoEntry: configRepoMap.entrySet()) {
             String repoPath = configRepoEntry.getKey();
@@ -193,13 +183,13 @@ public static Map<String, String> detectBranchChange() {
                 continue;
             }
 
-            UserFile.User user = userFile.getUser(configRepo.email);
-            if (user == null) {
+            userAccount = userAccount.getUser(configRepo.email);
+            if (userAccount == null) {
                 // Could not find the user with this email in user.yml file.
                 continue;
             }
 
-            if (user.getAccessToken() == null) {
+            if (userAccount.getAccessToken() == null) {
                 CodeSyncLogger.error(String.format("Access token not found for repo: %s, %s`.", repoPath, configRepo.email));
                 continue;
             }
diff --git a/src/main/java/org/intellij/sdk/codesync/ProjectOpenCloseListener.java b/src/main/java/org/intellij/sdk/codesync/ProjectOpenCloseListener.java
index 2f0ed82e..af7b431a 100644
--- a/src/main/java/org/intellij/sdk/codesync/ProjectOpenCloseListener.java
+++ b/src/main/java/org/intellij/sdk/codesync/ProjectOpenCloseListener.java
@@ -22,6 +22,7 @@
 import org.apache.commons.codec.digest.DigestUtils;
 import org.intellij.sdk.codesync.alerts.ActivityAlerts;
 import org.intellij.sdk.codesync.codeSyncSetup.CodeSyncSetup;
+import org.intellij.sdk.codesync.database.Database;
 import org.intellij.sdk.codesync.exceptions.common.FileNotInModuleError;
 import org.intellij.sdk.codesync.locks.CodeSyncLock;
 import org.intellij.sdk.codesync.state.StateUtils;
@@ -191,6 +192,7 @@ public void projectClosed(@NotNull Project project) {
   }
 
   public void disposeProjectListeners(Project project) {
+    Database.disconnect();
     // Release all the locks acquired by this project.
     CodeSyncLock.releaseAllLocks(LockFileType.PROJECT_LOCK, project.getName());
     CodeSyncLock.releaseAllLocks(LockFileType.HANDLE_BUFFER_LOCK, project.getName());
diff --git a/src/main/java/org/intellij/sdk/codesync/alerts/ActivityAlerts.java b/src/main/java/org/intellij/sdk/codesync/alerts/ActivityAlerts.java
index 3c44e533..19c17d49 100644
--- a/src/main/java/org/intellij/sdk/codesync/alerts/ActivityAlerts.java
+++ b/src/main/java/org/intellij/sdk/codesync/alerts/ActivityAlerts.java
@@ -6,7 +6,7 @@
 import org.intellij.sdk.codesync.Constants;
 import org.intellij.sdk.codesync.clients.CodeSyncClient;
 import org.intellij.sdk.codesync.files.AlertsFile;
-import org.intellij.sdk.codesync.files.UserFile;
+import org.intellij.sdk.codesync.models.UserAccount;
 import org.intellij.sdk.codesync.locks.CodeSyncLock;
 import org.intellij.sdk.codesync.ui.dialogs.ActivityAlertDialog;
 import org.intellij.sdk.codesync.utils.CommonUtils;
@@ -86,8 +86,8 @@ public static void showActivityAlert(Project project) {
         }
         CodeSyncLogger.debug("[CODESYNC_DAEMON] [ACTIVITY_ALERT] Activity alert lock acquired.");
 
-        String accessToken = UserFile.getAccessToken();
-        String email = UserFile.getEmail();
+        String accessToken = UserAccount.getAccessTokenByEmail();
+        String email = UserAccount.getEmail();
 
         if (accessToken == null) {
             ActivityAlerts.remindLater(5);
diff --git a/src/main/java/org/intellij/sdk/codesync/auth/AuthAction.java b/src/main/java/org/intellij/sdk/codesync/auth/AuthAction.java
index fad9e28c..f5274853 100644
--- a/src/main/java/org/intellij/sdk/codesync/auth/AuthAction.java
+++ b/src/main/java/org/intellij/sdk/codesync/auth/AuthAction.java
@@ -9,17 +9,11 @@
 import org.intellij.sdk.codesync.NotificationManager;
 import org.intellij.sdk.codesync.commands.ClearReposToIgnoreCache;
 import org.intellij.sdk.codesync.commands.ReloadStateCommand;
-import org.intellij.sdk.codesync.exceptions.InvalidYmlFileError;
-import org.intellij.sdk.codesync.files.UserFile;
+import org.intellij.sdk.codesync.models.UserAccount;
 import org.intellij.sdk.codesync.state.PluginState;
 import org.intellij.sdk.codesync.state.StateUtils;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.FileNotFoundException;
-
-import static org.intellij.sdk.codesync.Constants.*;
-
-
 public class AuthAction extends AnAction {
     @Override
     public void update(@NotNull AnActionEvent e) {
@@ -59,44 +53,13 @@ public void actionPerformed(@NotNull AnActionEvent e) {
             server =  CodeSyncAuthServer.getInstance();
             String targetURL = server.getAuthorizationUrl();
             if (pluginState.isAuthenticated) {
-                UserFile userFile;
-                try {
-                    userFile = new UserFile(USER_FILE_PATH);
-                } catch (FileNotFoundException error) {
-                    NotificationManager.notifyError(
-                            "An error occurred trying to logout the user, please tyr again later.", project
-                    );
-                    CodeSyncLogger.error(
-                            String.format("[INTELLIJ_AUTH_ERROR]: auth file not found. Error: %s", error.getMessage())
-                    );
-                    return;
-                } catch (InvalidYmlFileError error) {
-                    error.printStackTrace();
-                    NotificationManager.notifyError(
-                            "An error occurred trying to logout the user, please tyr again later.", project
-                    );
-                    CodeSyncLogger.critical(
-                            String.format("[INTELLIJ_AUTH_ERROR]: Invalid auth file. Error: %s", error.getMessage()),
-                            pluginState.userEmail
-                    );
-                    // Could not read user file.
-                    return;
-                }
-                userFile.makeAllUsersInActive();
+                UserAccount userAccount = new UserAccount();
 
                 // Clear any cache that depends on user authentication status.
                 new ClearReposToIgnoreCache().execute();
-                try {
-                    userFile.writeYml();
-                } catch (FileNotFoundException | InvalidYmlFileError error) {
-                    NotificationManager.notifyError(
-                            "An error occurred trying to logout the user, please tyr again later.", project
-                    );
-                    CodeSyncLogger.error(
-                            String.format("[INTELLIJ_AUTH_ERROR]: Could write to auth file. Error: %s", error.getMessage())
-                    );
-                    return;
-                }
+
+                userAccount.makeAllUsersInActive();
+
                 // Reload the state now.
                 StateUtils.reloadState(project);
 
diff --git a/src/main/java/org/intellij/sdk/codesync/auth/Authenticator.java b/src/main/java/org/intellij/sdk/codesync/auth/Authenticator.java
index 407c4106..f86b75c6 100644
--- a/src/main/java/org/intellij/sdk/codesync/auth/Authenticator.java
+++ b/src/main/java/org/intellij/sdk/codesync/auth/Authenticator.java
@@ -4,17 +4,14 @@
 
 import org.intellij.sdk.codesync.CodeSyncLogger;
 import org.intellij.sdk.codesync.commands.ClearReposToIgnoreCache;
-import org.intellij.sdk.codesync.exceptions.FileLockedError;
 import org.intellij.sdk.codesync.exceptions.InvalidJsonError;
-import org.intellij.sdk.codesync.exceptions.InvalidYmlFileError;
 import org.intellij.sdk.codesync.exceptions.RequestError;
-import org.intellij.sdk.codesync.files.UserFile;
+import org.intellij.sdk.codesync.models.UserAccount;
 import org.json.simple.JSONObject;
 
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Map;
 
@@ -77,48 +74,13 @@ public boolean createUser(String accessToken, String idToken){
             );
             return false;
         }
-        UserFile userFile;
-        try {
-            userFile = new UserFile(USER_FILE_PATH);
-        } catch (FileNotFoundException e) {
-            if(UserFile.createFile(USER_FILE_PATH)){
-                try {
-                    userFile = new UserFile(USER_FILE_PATH);
-                } catch (FileNotFoundException | InvalidYmlFileError error) {
-                    CodeSyncLogger.error(
-                        String.format("[INTELLIJ_AUTH_ERROR]: Error opening auth file. Error: %s", error.getMessage())
-                    );
-                    // Could not open user file.
-                    return false;
-                }
-            } else {
-                // Could not create user file.
-                return false;
-            }
-            CodeSyncLogger.error(
-                String.format("[INTELLIJ_AUTH_ERROR]: auth file not found. Error: %s", e.getMessage())
-            );
-        } catch (InvalidYmlFileError error) {
-            error.printStackTrace();
-            CodeSyncLogger.critical(
-                String.format("[INTELLIJ_AUTH_ERROR]: Invalid auth file. Error: %s", error.getMessage())
-            );
-            // Could not read user file.
-            return false;
-        }
+        UserAccount userAccount;
+        userAccount = new UserAccount();
         String userEmail = claims.get("email").asString();
-        userFile.setActiveUser(userEmail, accessToken);
 
         // Clear any cache that depends on user authentication status.
         new ClearReposToIgnoreCache().execute();
-        try {
-            userFile.writeYml();
-        } catch (FileNotFoundException | InvalidYmlFileError | FileLockedError e) {
-            CodeSyncLogger.error(
-                String.format("[INTELLIJ_AUTH_ERROR]: Could not write to auth file. Error: %s", e.getMessage())
-            );
-            return false;
-        }
+        userAccount.setActiveUser(userEmail, accessToken);
 
         CodeSyncLogger.debug("[INTELLIJ_AUTH]: User completed login flow.");
         return true;
diff --git a/src/main/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetup.java b/src/main/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetup.java
index b4c79cbe..8c75c1ef 100644
--- a/src/main/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetup.java
+++ b/src/main/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetup.java
@@ -11,6 +11,7 @@
 import com.intellij.openapi.project.Project;
 import kotlin.Pair;
 import org.intellij.sdk.codesync.CodeSyncLogger;
+import org.intellij.sdk.codesync.database.Database;
 import org.intellij.sdk.codesync.NotificationManager;
 import org.intellij.sdk.codesync.Utils;
 import org.intellij.sdk.codesync.auth.CodeSyncAuthServer;
@@ -23,6 +24,7 @@
 import org.intellij.sdk.codesync.exceptions.network.ServerConnectionError;
 import org.intellij.sdk.codesync.exceptions.repo.RepoNotActive;
 import org.intellij.sdk.codesync.files.*;
+import org.intellij.sdk.codesync.models.UserAccount;
 import org.intellij.sdk.codesync.state.PluginState;
 import org.intellij.sdk.codesync.state.StateUtils;
 import org.intellij.sdk.codesync.ui.dialogs.RepoPublicPrivateDialog;
@@ -40,7 +42,6 @@
 import org.json.simple.JSONObject;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
@@ -71,21 +72,10 @@ public static void disconnectRepo(Project project, String repoPath, String repoN
             if (!configFile.isRepoActive(repoPath)) {
                throw new RepoNotActive(String.format("Repo '%s' is not active and can not be disconnected.", repoName));
             };
-            UserFile userFile;
-
-            try {
-                userFile = new UserFile(USER_FILE_PATH);
-            } catch (FileNotFoundException | InvalidYmlFileError e) {
-                throw new UserFileError(
-                    String.format(
-                        "Repo '%s' could not be disconnected because there was an error trying to read user file. Error: %s",
-                        repoName, e.getMessage()
-                    )
-                );
-            }
+            UserAccount userAccount = new UserAccount();
             ConfigRepo configRepo = configFile.getRepo(repoPath);
-            UserFile.User user = userFile.getUser(configRepo.email);
-            if (user == null) {
+            userAccount = userAccount.getUser(configRepo.email);
+            if (userAccount == null) {
                 throw new UserFileError(
                     String.format(
                         "Repo '%s' could not be disconnected because user data is missing from user file.",
@@ -93,7 +83,7 @@ public static void disconnectRepo(Project project, String repoPath, String repoN
                     )
                 );
             }
-            String accessToken = user.getAccessToken();
+            String accessToken = userAccount.getAccessToken();
             CodeSyncClient codeSyncClient = new CodeSyncClient();
 
             if (!codeSyncClient.isServerUp()) {
@@ -208,6 +198,7 @@ public static void createSystemDirectories() {
                 CodeSyncYmlFile.createFile(systemFilePath);
             }
         }
+        Database.initiate();
     }
 
     /*
@@ -255,13 +246,8 @@ public static boolean validateAccessToken(String accessToken) throws InvalidAcce
      */
     public static boolean checkUserAccess(Project project, String repoPath, String repoName, String branchName, boolean skipSyncPrompt, boolean isSyncingBranch) {
         String accessToken;
-        try {
-            UserFile userFile = new UserFile(USER_FILE_PATH);
-            accessToken = userFile.getActiveAccessToken();
-        } catch (FileNotFoundException | InvalidYmlFileError error) {
-            // Set access token to null to trigger user signup.
-            accessToken = null;
-        }
+        UserAccount userAccount = new UserAccount();
+        accessToken = userAccount.getActiveAccessToken();
 
         // User already has access token, no need to proceed.
         if (accessToken != null) {
@@ -485,7 +471,7 @@ public static boolean uploadRepo(String repoPath, String repoName, String[] file
             }
         }
 
-        String accessToken = UserFile.getAccessToken();
+        String accessToken = UserAccount.getAccessTokenByEmail();
         if (accessToken == null) {
             // Show error message.
             if (!isSyncingBranch) {
@@ -652,36 +638,9 @@ public static boolean uploadRepo(String repoPath, String repoName, String[] file
     }
 
     public static void saveIamUser(String email, String iamAccessKey, String iamSecretKey) {
-        UserFile userFile;
-        try {
-            userFile = new UserFile(USER_FILE_PATH, true);
-        } catch (FileNotFoundException e) {
-            CodeSyncLogger.critical(
-                    String.format("[INTELLI_REPO_INIT_ERROR]: auth file not found. Error: %s", e.getMessage())
-            );
-            return;
-        } catch (InvalidYmlFileError error) {
-            error.printStackTrace();
-            CodeSyncLogger.critical(
-                    String.format("[INTELLI_REPO_INIT_ERROR]: Invalid auth file. Error: %s", error.getMessage())
-            );
-            // Could not read user file.
-            return;
-        } catch (FileNotCreatedError error) {
-            CodeSyncLogger.critical(
-                    String.format("[INTELLI_REPO_INIT_ERROR]: Could not create user auth file. Error %s", error.getMessage())
-            );
-            return;
-        }
-
-        userFile.setActiveUser(email, iamAccessKey, iamSecretKey);
-        try {
-            userFile.writeYml();
-        } catch (FileNotFoundException | InvalidYmlFileError | FileLockedError error) {
-            CodeSyncLogger.critical(
-                    String.format("[INTELLI_REPO_INIT_ERROR]: Could not write to user auth file. Error %s", error.getMessage())
-            );
-        }
+        UserAccount userAccount;
+        userAccount = new UserAccount();
+        userAccount.setActiveUser(email, iamAccessKey, iamSecretKey);
     }
 
     public static void saveFileIds(
diff --git a/src/main/java/org/intellij/sdk/codesync/commands/ResumeCodeSyncCommand.java b/src/main/java/org/intellij/sdk/codesync/commands/ResumeCodeSyncCommand.java
index 6663e2e8..20dd2674 100644
--- a/src/main/java/org/intellij/sdk/codesync/commands/ResumeCodeSyncCommand.java
+++ b/src/main/java/org/intellij/sdk/codesync/commands/ResumeCodeSyncCommand.java
@@ -6,7 +6,7 @@
 import org.intellij.sdk.codesync.auth.CodeSyncAuthServer;
 import org.intellij.sdk.codesync.codeSyncSetup.CodeSyncSetup;
 import org.intellij.sdk.codesync.exceptions.InvalidAccessTokenError;
-import org.intellij.sdk.codesync.files.UserFile;
+import org.intellij.sdk.codesync.models.UserAccount;
 
 /*
 This command first checks the existence of access token in user.yml file and if it is present
@@ -38,7 +38,7 @@ public ResumeCodeSyncCommand(Project project, String repoPath, String repoName,
     }
 
     public void execute() {
-        String accessToken = UserFile.getAccessToken();
+        String accessToken = UserAccount.getAccessTokenByEmail();
 
         try {
             if (accessToken != null && CodeSyncSetup.validateAccessToken(accessToken)) {
diff --git a/src/main/java/org/intellij/sdk/codesync/database/Database.java b/src/main/java/org/intellij/sdk/codesync/database/Database.java
new file mode 100644
index 00000000..851e15c4
--- /dev/null
+++ b/src/main/java/org/intellij/sdk/codesync/database/Database.java
@@ -0,0 +1,102 @@
+package org.intellij.sdk.codesync.database;
+
+import org.intellij.sdk.codesync.database.migrations.MigrateUser;
+import org.intellij.sdk.codesync.utils.Queries;
+
+import java.io.File;
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import static org.intellij.sdk.codesync.Constants.*;
+
+public class Database {
+
+    private static Connection connection = null;
+
+    public static void initiate() {
+        try{
+            File file = new File(DATABASE_PATH);
+            if(!file.exists()){
+                Class.forName("org.sqlite.JDBC");
+                String connectionString = CONNECTION_STRING;
+                connection = DriverManager.getConnection(connectionString);
+                executeUpdate(Queries.User.CREATE_TABLE);
+                MigrateUser migrateUser = new MigrateUser();
+                migrateUser.migrateData();
+            }else {
+                Class.forName("org.sqlite.JDBC");
+                String connectionString = CONNECTION_STRING;
+                connection = DriverManager.getConnection(connectionString);
+                executeUpdate(Queries.User.CREATE_TABLE);
+            }
+
+        }catch (Exception exception) {
+            System.out.println("Database connection error: " + exception.getMessage());
+        }
+    }
+
+    public static void initiate(String connectionString) {
+        try{
+            Class.forName("org.sqlite.JDBC");
+            connection = DriverManager.getConnection(connectionString);
+        }catch (Exception exception) {
+            System.out.println("Database connection error: " + exception.getMessage());
+        }
+    }
+
+    /*
+    This method accepts a SELECT query and then using
+    executeQuery method fetch rows from database.
+
+    Every row is stored as a hashmap, where key is column name and value is column value.
+
+    Then every row stored as a hashmap is added to arraylist which is returned as a list of rows.
+     */
+    public static ArrayList<HashMap<String, String>> runQuery(String query){
+        try {
+            Statement statement = connection.createStatement();
+            ResultSet rs = statement.executeQuery(query);
+            ResultSetMetaData md = rs.getMetaData();
+
+            ArrayList<HashMap<String, String>> dataSet = new ArrayList<>();
+
+            while (rs.next()){
+                HashMap<String, String> row = new HashMap<>();
+                for(int i = 1; i <= md.getColumnCount(); i++){
+                    row.put(md.getColumnName(i), rs.getString(i));
+                }
+                dataSet.add(row);
+            }
+
+            if(dataSet.size() == 0)
+                return null;
+
+            return dataSet;
+
+        } catch (Exception exception) {
+            System.out.println("DATABASE: [FETCH ERROR] " + exception.getMessage());
+        }
+
+        return null;
+    }
+
+    public static int executeUpdate(String query){
+        try {
+            Statement statement = connection.createStatement();
+            return statement.executeUpdate(query);
+        } catch (Exception exception) {
+            System.out.println("DATABASE: [INSERTION ERROR] " + exception.getMessage());
+        }
+        return -1;
+    }
+
+    public static void disconnect(){
+        try {
+            connection.close();
+        }catch (Exception exception){
+            System.out.println("Error while disconnecting database: " + exception.getMessage());
+        }
+    }
+
+}
diff --git a/src/main/java/org/intellij/sdk/codesync/database/UserTable.java b/src/main/java/org/intellij/sdk/codesync/database/UserTable.java
new file mode 100644
index 00000000..65d77180
--- /dev/null
+++ b/src/main/java/org/intellij/sdk/codesync/database/UserTable.java
@@ -0,0 +1,62 @@
+package org.intellij.sdk.codesync.database;
+
+import org.intellij.sdk.codesync.models.UserAccount;
+import org.intellij.sdk.codesync.utils.Queries;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+public class UserTable {
+
+    public static void insertNewUser(UserAccount userAccount){
+        Database.executeUpdate(Queries.User.insert(userAccount.getUserEmail(), userAccount.getAccessToken(), userAccount.getSecretKey(), userAccount.getAccessKey(), userAccount.getActive()));
+    }
+
+    public static int updateUser(UserAccount userAccount){
+        return Database.executeUpdate(Queries.User.update_by_email(userAccount.getAccessToken(), userAccount.getSecretKey(), userAccount.getAccessKey(), userAccount.getActive(), userAccount.getUserEmail()));
+    }
+
+    public static void updateAllUsersInActive(){
+        Database.executeUpdate(Queries.User.update_all_by_active_status(false));
+    }
+
+    public static UserAccount getActiveUser(){
+        ArrayList<HashMap<String, String>> usersArray = Database.runQuery(Queries.User.get_by_active_status(true));
+
+        if(usersArray != null){
+            UserAccount userAccount = new UserAccount((String) usersArray.get(0).get("EMAIL"));
+            userAccount.setAccessKey((String) usersArray.get(0).getOrDefault("ACCESS_KEY", null));
+            userAccount.setAccessToken((String) usersArray.get(0).getOrDefault("ACCESS_TOKEN", null));
+            userAccount.setSecretKey((String) usersArray.get(0).getOrDefault("SECRET_KEY", null));
+            if(((String)usersArray.get(0).getOrDefault("IS_ACTIVE", null)).equals("1")){
+                userAccount.makeActive();
+            }else {
+                userAccount.makeInActive();
+            }
+            return userAccount;
+        }
+
+        return null;
+
+    }
+
+    public static UserAccount getByEmail(String email){
+        ArrayList<HashMap<String, String>> usersArray = Database.runQuery(Queries.User.get_by_email(email));
+
+        if(usersArray != null){
+            UserAccount userAccount = new UserAccount((String) usersArray.get(0).get("EMAIL"));
+            userAccount.setAccessToken((String) usersArray.get(0).getOrDefault("ACCESS_TOKEN", null));
+            userAccount.setSecretKey((String) usersArray.get(0).getOrDefault("SECRET_KEY", null));
+            userAccount.setAccessKey((String) usersArray.get(0).getOrDefault("ACCESS_KEY", null));
+            if(((String)usersArray.get(0).getOrDefault("IS_ACTIVE", null)).equals("1")){
+                userAccount.makeActive();
+            }else {
+                userAccount.makeInActive();
+            }
+            return userAccount;
+        }
+
+        return null;
+    }
+
+}
diff --git a/src/main/java/org/intellij/sdk/codesync/database/migrations/MigrateUser.java b/src/main/java/org/intellij/sdk/codesync/database/migrations/MigrateUser.java
new file mode 100644
index 00000000..b654dbd4
--- /dev/null
+++ b/src/main/java/org/intellij/sdk/codesync/database/migrations/MigrateUser.java
@@ -0,0 +1,68 @@
+package org.intellij.sdk.codesync.database.migrations;
+
+import com.google.common.io.CharStreams;
+import org.intellij.sdk.codesync.database.UserTable;
+import org.intellij.sdk.codesync.exceptions.InvalidYmlFileError;
+import org.intellij.sdk.codesync.models.UserAccount;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.error.YAMLException;
+
+import java.io.*;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.intellij.sdk.codesync.Constants.USER_FILE_PATH;
+public class MigrateUser {
+
+    File userFile = new File(USER_FILE_PATH);
+    public Map<String, Object> contentsMap;
+    public Map<String, UserAccount> users = new HashMap<>();
+
+    private void readYml() throws FileNotFoundException, InvalidYmlFileError {
+        Yaml yaml = new Yaml();
+        InputStream inputStream;
+        inputStream = new FileInputStream(userFile);
+        String text = null;
+
+        try (Reader reader = new InputStreamReader(inputStream)) {
+            text = CharStreams.toString(reader);
+            this.contentsMap = yaml.load(text);
+        } catch (IOException | YAMLException e) {
+            throw new InvalidYmlFileError(e.getMessage());
+        }
+    }
+
+    private void loadYmlContent () throws InvalidYmlFileError {
+        if (this.contentsMap == null) {
+            return;
+        }
+        try {
+            for (Map.Entry<String, Object> userEntry : this.contentsMap.entrySet()) {
+                if (userEntry.getValue() != null) {
+                    Map<String, Object> userCredentials = (Map<String, Object>) userEntry.getValue();
+                    this.users.put(userEntry.getKey(), new UserAccount(userEntry.getKey(), userCredentials));
+                }
+            }
+        } catch (ClassCastException e){
+            throw new InvalidYmlFileError(
+                    String.format("User yml file \"%s\" is not valid. Error: %s", this.userFile.getPath(), e.getMessage())
+            );
+        }
+    }
+
+    public void migrateData(){
+        try{
+            readYml();
+            loadYmlContent();
+            for(String key : users.keySet()){
+                UserTable.insertNewUser(users.get(key));
+            }
+        } catch (InvalidYmlFileError e) {
+            throw new RuntimeException(e);
+        } catch (FileNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+}
diff --git a/src/main/java/org/intellij/sdk/codesync/files/UserFile.java b/src/main/java/org/intellij/sdk/codesync/files/UserFile.java
deleted file mode 100644
index 6d926a52..00000000
--- a/src/main/java/org/intellij/sdk/codesync/files/UserFile.java
+++ /dev/null
@@ -1,265 +0,0 @@
-package org.intellij.sdk.codesync.files;
-
-import org.intellij.sdk.codesync.exceptions.FileNotCreatedError;
-import org.intellij.sdk.codesync.exceptions.InvalidYmlFileError;
-import org.intellij.sdk.codesync.utils.CommonUtils;
-
-import java.io.*;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.intellij.sdk.codesync.Constants.USER_FILE_PATH;
-
-
-public class UserFile extends CodeSyncYmlFile {
-    File userFile;
-    public Map<String, Object> contentsMap;
-    public Map<String, User> users = new HashMap<>();
-
-    public static class User {
-        String userEmail, accessKey = null, secretKey = null, accessToken = null;
-        Boolean isActive = false;
-
-        public User(String userEmail, Map<String, Object> userCredentials) {
-            this.userEmail = userEmail;
-            this.accessKey = (String) userCredentials.getOrDefault("access_key", null);
-            this.secretKey = (String) userCredentials.getOrDefault("secret_key", null);
-            this.accessToken = (String) userCredentials.getOrDefault("access_token", null);
-            this.isActive = CommonUtils.getBoolValue(userCredentials, "is_active", false);
-        }
-
-        /*
-        Construct a user instance with Auth0 access token.
-         */
-        public User(String userEmail, String accessToken) {
-            this.userEmail = userEmail;
-            this.accessToken = accessToken;
-            this.isActive = true;
-        }
-
-        /*
-        Construct a user instance with IAM access and secret.
-         */
-        public User(String userEmail, String iamAccessKey, String iamSecretKey) {
-            this.userEmail = userEmail;
-            this.accessKey = iamAccessKey;
-            this.secretKey = iamSecretKey;
-        }
-
-        public String getUserEmail () {
-            return this.userEmail;
-        }
-        public String getAccessKey () { return this.accessKey; }
-        public String getAccessToken () { return this.accessToken; }
-        public String getSecretKey () {
-            return this.secretKey;
-        }
-
-        public void setAccessKey (String accessKey) { this.accessKey = accessKey; }
-        public void setAccessToken (String accessToken) { this.accessToken = accessToken; }
-        public void setSecretKey (String secretKey) { this.secretKey = secretKey; }
-        public void makeActive () { this.isActive = true; }
-        public void makeInActive () { this.isActive = false; }
-
-
-        public Map<String, Object> getYMLAsHashMap() {
-            Map<String, Object> user = new HashMap<>();
-            user.put("access_key", this.accessKey);
-            user.put("secret_key", this.secretKey);
-            user.put("access_token", this.accessToken);
-            user.put("is_active", this.isActive);
-            return user;
-        }
-    }
-
-    public UserFile (String filePath) throws FileNotFoundException, InvalidYmlFileError {
-        File userFile = new File(filePath);
-
-        if (!userFile.isFile()) {
-            throw new FileNotFoundException(String.format("User file \"%s\" does not exist.", filePath));
-        }
-        this.userFile = userFile;
-        this.contentsMap = this.readYml();
-        this.loadYmlContent();
-    }
-
-    /*
-    Instantiate a user file, create the file if it does not exist.
-     */
-    public UserFile (String filePath, boolean shouldCreateIfAbsent) throws FileNotFoundException, FileNotCreatedError, InvalidYmlFileError {
-        File userFile = new File(filePath);
-
-        if (!userFile.isFile() && shouldCreateIfAbsent) {
-            boolean isFileReady = createFile(filePath);
-            if (!isFileReady) {
-                throw new FileNotCreatedError(String.format("User file \"%s\" could not be created.", filePath));
-            }
-        } else if(!userFile.isFile()) {
-            throw new FileNotFoundException(String.format("User file \"%s\" does not exist.", filePath));
-        }
-
-        this.userFile = userFile;
-        this.contentsMap = this.readYml();
-        this.loadYmlContent();
-    }
-
-    /*
-    Get access token for the user or null.
-
-    This is a utility method and can be called in places where it has already been made sure that file with correct
-    access token will be present.
-     */
-    public static String getAccessToken(String email) {
-        UserFile userFile;
-        try {
-            userFile = new UserFile(USER_FILE_PATH);
-        } catch (FileNotFoundException | InvalidYmlFileError e) {
-            return null;
-        }
-        UserFile.User user = email == null ? userFile.getActiveUser(): userFile.getActiveUser(email);
-        if (user != null) {
-            return user.getAccessToken();
-        }
-
-        return null;
-    }
-
-   /*
-    Get email of the default user or null.
-     */
-    public static String getEmail() {
-        UserFile userFile;
-        try {
-            userFile = new UserFile(USER_FILE_PATH);
-        } catch (FileNotFoundException | InvalidYmlFileError e) {
-            return null;
-        }
-
-        UserFile.User user =  userFile.getActiveUser();
-        return user != null ? user.getUserEmail(): null;
-    }
-
-    /*
-    Get access token for the first user in the file or null.
-
-    This is a utility method and can be called in places where it has already been made sure that file with correct
-    access token will be present.
-     */
-    public static String getAccessToken() {
-        return getAccessToken(null);
-    }
-
-    public File getYmlFile()  {
-        return this.userFile;
-    }
-
-    public Map<String, Object> getYMLAsHashMap() {
-        Map<String, Object> contents = new HashMap<>();
-        for (User user: this.users.values()) {
-            contents.put(user.getUserEmail(), user.getYMLAsHashMap());
-        }
-        return contents;
-    }
-
-    private void loadYmlContent () throws InvalidYmlFileError {
-        if (this.contentsMap == null) {
-            return;
-        }
-        try {
-            for (Map.Entry<String, Object> userEntry : this.contentsMap.entrySet()) {
-                if (userEntry.getValue() != null) {
-                    Map<String, Object> userCredentials = (Map<String, Object>) userEntry.getValue();
-                    this.users.put(userEntry.getKey(), new User(userEntry.getKey(), userCredentials));
-                }
-
-            }
-        } catch (ClassCastException e){
-            throw new InvalidYmlFileError(
-                String.format("User yml file \"%s\" is not valid. Error: %s", this.getYmlFile().getPath(), e.getMessage())
-            );
-        }
-    }
-
-    /*
-    Get the user matching the given email.
-     */
-    public User getUser(String userEmail) {
-        return this.users.getOrDefault(userEmail, null);
-    }
-
-    /*
-     Get the access token of the active user from the map.
-     */
-    public String getActiveAccessToken() {
-        User user = this.getActiveUser();
-        if (user != null) {
-            return user.accessToken;
-        }
-        return null;
-    }
-
-    /*
-    Get the active user from the map.
-     */
-    public User getActiveUser(String email) {
-        User user = getUser(email);
-        return user.isActive ? user: null;
-    }
-
-    /*
-    Get the active user from the map.
-     */
-    public User getActiveUser() {
-        for (User user: this.users.values()) {
-            if (user.isActive) {
-                return user;
-            }
-        }
-        return null;
-    }
-
-    /*
-    Set user using Auth0 access token.
-
-    This will also make sure that this user is set to active and all other users are
-    set to in-active via is_active flag.
-     */
-    public void setActiveUser(String userEmail, String accessToken) {
-        User user = getUser(userEmail);
-        if (user == null) {
-            user = new User(userEmail, accessToken);
-        } else {
-            user.setAccessToken(accessToken);
-        }
-        // First mark all users in-active.
-        this.makeAllUsersInActive();
-
-        // Now mark the new user active.
-        user.makeActive();
-        this.users.put(userEmail, user);
-    }
-
-    /*
-    Make all user's in-active by setting `is_active` to false.
-     */
-    public void makeAllUsersInActive() {
-        for (User user: this.users.values()) {
-            user.makeInActive();
-        }
-    }
-
-    /*
-    Set user using IAM access and secret.
-     */
-    public void setActiveUser(String userEmail, String iamAccessKey, String iamSecretKey) {
-        User user = getUser(userEmail);
-        if (user == null) {
-            user = new User(userEmail, iamAccessKey, iamSecretKey);
-        } else {
-            user.setAccessKey(iamAccessKey);
-            user.setSecretKey(iamSecretKey);
-        }
-        this.users.put(userEmail, user);
-    }
-
-}
diff --git a/src/main/java/org/intellij/sdk/codesync/models/UserAccount.java b/src/main/java/org/intellij/sdk/codesync/models/UserAccount.java
new file mode 100644
index 00000000..2b7aee9c
--- /dev/null
+++ b/src/main/java/org/intellij/sdk/codesync/models/UserAccount.java
@@ -0,0 +1,181 @@
+package org.intellij.sdk.codesync.models;
+
+import org.intellij.sdk.codesync.database.UserTable;
+import org.intellij.sdk.codesync.utils.CommonUtils;
+
+import java.util.Map;
+
+public class UserAccount {
+
+    public UserAccount(){}
+    String userEmail, accessKey = null, secretKey = null, accessToken = null;
+    Boolean isActive = false;
+
+    public UserAccount(String userEmail, Map<String, Object> userCredentials) {
+        this.userEmail = userEmail;
+        this.accessKey = (String) userCredentials.getOrDefault("access_key", null);
+        this.secretKey = (String) userCredentials.getOrDefault("secret_key", null);
+        this.accessToken = (String) userCredentials.getOrDefault("access_token", null);
+        this.isActive = CommonUtils.getBoolValue(userCredentials, "is_active", false);
+    }
+
+    public UserAccount(String userEmail) {
+        this.userEmail = userEmail;
+    }
+
+    /*
+    Construct a user instance with Auth0 access token.
+     */
+    public UserAccount(String userEmail, String accessToken) {
+        this.userEmail = userEmail;
+        this.accessToken = accessToken;
+        this.isActive = true;
+    }
+
+    /*
+    Construct a user instance with IAM access and secret.
+     */
+    public UserAccount(String userEmail, String iamAccessKey, String iamSecretKey) {
+        this.userEmail = userEmail;
+        this.accessKey = iamAccessKey;
+        this.secretKey = iamSecretKey;
+    }
+
+    public String getUserEmail () {
+        return this.userEmail;
+    }
+    public String getAccessKey () { return this.accessKey; }
+    public String getAccessToken () { return this.accessToken; }
+    public String getSecretKey () {
+        return this.secretKey;
+    }
+
+    public void setAccessKey (String accessKey) { this.accessKey = accessKey; }
+    public void setAccessToken (String accessToken) { this.accessToken = accessToken; }
+    public void setSecretKey (String secretKey) { this.secretKey = secretKey; }
+    public void makeActive () { this.isActive = true; }
+    public void makeInActive () { this.isActive = false; }
+    public Boolean getActive() {
+        return isActive;
+    }
+
+    /*
+    Get access token for the user or null.
+
+    This is a utility method and can be called in places where it has already been made sure that file with correct
+    access token will be present.
+     */
+    public static String getAccessToken(String email) {
+
+        UserAccount userAccount = new UserAccount();
+
+        userAccount = email == null ? userAccount.getActiveUser(): userAccount.getActiveUser(email);
+        if (userAccount != null) {
+            return userAccount.getAccessToken();
+        }
+
+        return null;
+    }
+
+   /*
+    Get email of the default user or null.
+     */
+    public static String getEmail() {
+        UserAccount userAccount = new UserAccount();
+        return userAccount.getActiveUser() != null ? userAccount.getActiveUser().getUserEmail(): null;
+    }
+
+    /*
+    Get access token for the first user in the file or null.
+
+    This is a utility method and can be called in places where it has already been made sure that file with correct
+    access token will be present.
+     */
+    public static String getAccessTokenByEmail() {
+        return getAccessToken(null);
+    }
+
+    /*
+    Get the user matching the given email.
+     */
+    public UserAccount getUser(String userEmail) {
+        return UserTable.getByEmail(userEmail);
+    }
+
+    /*
+     Get the access token of the active user from the map.
+     */
+    public String getActiveAccessToken() {
+        UserAccount userAccount = this.getActiveUser();
+        if (userAccount != null) {
+            return userAccount.accessToken;
+        }
+        return null;
+    }
+
+    /*
+    Get the active user from the map.
+     */
+    public UserAccount getActiveUser(String email) {
+        UserAccount userAccount = getUser(email);
+        if(userAccount != null){
+            return userAccount.isActive ? userAccount : null;
+        }
+        return null;
+    }
+
+    /*
+    Get the active user from the map.
+     */
+    public UserAccount getActiveUser() {
+        return UserTable.getActiveUser();
+    }
+
+    /*
+    Set user using Auth0 access token.
+
+    This will also make sure that this user is set to active and all other users are
+    set to in-active via is_active flag.
+     */
+    public void setActiveUser(String userEmail, String accessToken) {
+        UserAccount userAccount = getUser(userEmail);
+        if (userAccount == null) {
+            userAccount = new UserAccount(userEmail, accessToken);
+            // First mark all users in-active.
+            this.makeAllUsersInActive();
+            // Now mark the new user active.
+            userAccount.makeActive();
+            UserTable.insertNewUser(userAccount);
+        } else {
+            userAccount.setAccessToken(accessToken);
+            // First mark all users in-active.
+            this.makeAllUsersInActive();
+            // Now mark the new user active.
+            userAccount.makeActive();
+            UserTable.updateUser(userAccount);
+        }
+    }
+
+    /*
+    Make all user's in-active by setting `is_active` to false.
+     */
+    public void makeAllUsersInActive() {
+        UserTable.updateAllUsersInActive();
+    }
+
+    /*
+    Set user using IAM access and secret.
+     */
+    public void setActiveUser(String userEmail, String iamAccessKey, String iamSecretKey) {
+        UserAccount userAccount = getUser(userEmail);
+        if (userAccount == null) {
+            userAccount = new UserAccount(userEmail, iamAccessKey, iamSecretKey);
+            UserTable.insertNewUser(userAccount);
+        } else {
+            userAccount.setAccessKey(iamAccessKey);
+            userAccount.setSecretKey(iamSecretKey);
+            UserTable.updateUser(userAccount);
+        }
+    }
+
+}
diff --git a/src/main/java/org/intellij/sdk/codesync/state/StateUtils.java b/src/main/java/org/intellij/sdk/codesync/state/StateUtils.java
index e051cdff..48e51429 100644
--- a/src/main/java/org/intellij/sdk/codesync/state/StateUtils.java
+++ b/src/main/java/org/intellij/sdk/codesync/state/StateUtils.java
@@ -3,19 +3,16 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.intellij.sdk.codesync.exceptions.InvalidConfigFileError;
-import org.intellij.sdk.codesync.exceptions.InvalidYmlFileError;
 import org.intellij.sdk.codesync.files.ConfigFile;
 import org.intellij.sdk.codesync.files.ConfigRepo;
-import org.intellij.sdk.codesync.files.UserFile;
+import org.intellij.sdk.codesync.models.UserAccount;
 import org.intellij.sdk.codesync.utils.FileUtils;
 import org.intellij.sdk.codesync.utils.ProjectUtils;
 
-import java.io.FileNotFoundException;
 import java.util.HashMap;
 import java.util.Map;
 
 import static org.intellij.sdk.codesync.Constants.CONFIG_PATH;
-import static org.intellij.sdk.codesync.Constants.USER_FILE_PATH;
 
 public class StateUtils {
     private static final Map<String, PluginState> projectStateMap = new HashMap<>();
@@ -31,15 +28,11 @@ static public PluginState getGlobalState(){
     static public void populateGlobalState (Project project) {
         globalState.project = project;
 
-        try {
-            UserFile userFile = new UserFile(USER_FILE_PATH);
-            UserFile.User user = userFile.getActiveUser();
-            globalState.isAuthenticated = user != null;
-            if (user != null) {
-                globalState.userEmail = user.getUserEmail();
-            }
-        } catch (FileNotFoundException | InvalidYmlFileError error) {
-            globalState.isAuthenticated = false;
+        UserAccount userAccount = new UserAccount();
+        userAccount = userAccount.getActiveUser();
+        globalState.isAuthenticated = userAccount != null;
+        if (userAccount != null) {
+            globalState.userEmail = userAccount.getUserEmail();
         }
     }
 
diff --git a/src/main/java/org/intellij/sdk/codesync/utils/Queries.java b/src/main/java/org/intellij/sdk/codesync/utils/Queries.java
new file mode 100644
index 00000000..14e91c87
--- /dev/null
+++ b/src/main/java/org/intellij/sdk/codesync/utils/Queries.java
@@ -0,0 +1,50 @@
+package org.intellij.sdk.codesync.utils;
+
+public class Queries {
+
+    public static class User{
+
+        public static final String TABLE_EXIST = Queries.table_exist("user");
+
+        //TODO Turn this into multiline string.
+        public static final String CREATE_TABLE = "CREATE TABLE IF NOT EXISTS user(EMAIL TEXT PRIMARY KEY, ACCESS_TOKEN TEXT, SECRET_KEY TEXT, ACCESS_KEY TEXT, IS_ACTIVE INT)";
+
+        public static String get_by_email(String email){
+            return String.format("SELECT * FROM user WHERE email='%s'", email);
+        }
+
+        public static String get_by_active_status(boolean isActive){
+            int is_active = isActive? 1 : 0;
+            return String.format("SELECT * FROM user WHERE is_active=%s", is_active);
+        }
+
+        public static String insert(String email, String access_token, String secret_key, String access_key, boolean is_active){
+            email = email != null? String.format("'%s'", email) : null;
+            access_token = access_token != null? String.format("'%s'", access_token) : null;
+            secret_key = secret_key != null? String.format("'%s'", secret_key) : null;
+            access_key = access_key != null? String.format("'%s'", access_key) : null;
+            int status = is_active? 1 : 0;
+            return String.format("INSERT INTO user VALUES(%s, %s, %s, %s, %s)", email, access_token, secret_key, access_key, status);
+        }
+
+        public static String update_by_email(String access_token, String secret_key, String access_key, boolean is_active, String email){
+            email = email != null? String.format("'%s'", email) : null;
+            access_token = access_token != null? String.format("'%s'", access_token) : null;
+            secret_key = secret_key != null? String.format("'%s'", secret_key) : null;
+            access_key = access_key != null? String.format("'%s'", access_key) : null;
+            int status = is_active? 1 : 0;
+            return String.format("UPDATE user SET access_token = %s, secret_key = %s, access_key = %s, is_active = %s WHERE email = %s", access_token, secret_key, access_key, status, email);
+        }
+
+        public static String update_all_by_active_status(boolean isActive){
+            int is_active = isActive? 1 : 0;
+            return String.format("UPDATE user SET is_active = %d", is_active);
+        }
+
+    }
+
+    public static String table_exist(String table_name){
+        return String.format("SELECT name FROM sqlite_master WHERE type='table' AND name='%s'", table_name);
+    }
+
+}
diff --git a/src/test/java/org/intellij/sdk/codesync/CodeSyncLoggerTest.kt b/src/test/java/org/intellij/sdk/codesync/CodeSyncLoggerTest.kt
new file mode 100644
index 00000000..c59cf7c2
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/CodeSyncLoggerTest.kt
@@ -0,0 +1,24 @@
+package org.intellij.sdk.codesync
+
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+
+class CodeSyncLoggerTest {
+
+    @BeforeEach
+    fun before(){
+
+    }
+
+    @AfterEach
+    fun after(){
+
+    }
+
+    @Test
+    fun validateLogEvent(){
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/HandleBufferTest.kt b/src/test/java/org/intellij/sdk/codesync/HandleBufferTest.kt
new file mode 100644
index 00000000..d242e068
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/HandleBufferTest.kt
@@ -0,0 +1,24 @@
+package org.intellij.sdk.codesync
+
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+
+class HandleBufferTest {
+
+    @BeforeEach
+    fun before(){
+
+    }
+
+    @AfterEach
+    fun after(){
+
+    }
+
+    @Test
+    fun validateHandleBuffer(){
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/Helper.kt b/src/test/java/org/intellij/sdk/codesync/Helper.kt
new file mode 100644
index 00000000..c429ad73
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/Helper.kt
@@ -0,0 +1,11 @@
+package org.intellij.sdk.codesync
+
+class Helper {
+
+    companion object {
+        val DIRECTORY_PATH = System.getProperty("user.dir") + "\\src\\test\\java\\test_data"
+        val DATABASE_FILE = "\\file.db"
+        val CONNECTION_STRING = "jdbc:sqlite:" + DIRECTORY_PATH + DATABASE_FILE
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/PopulateBufferTest.kt b/src/test/java/org/intellij/sdk/codesync/PopulateBufferTest.kt
new file mode 100644
index 00000000..6eabc073
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/PopulateBufferTest.kt
@@ -0,0 +1,24 @@
+package org.intellij.sdk.codesync
+
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+
+class PopulateBufferTest {
+
+    @BeforeEach
+    fun before(){
+
+    }
+
+    @AfterEach
+    fun after(){
+
+    }
+
+    @Test
+    fun validateDetectBranchChange(){
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/alerts/ActivityAlertsTest.kt b/src/test/java/org/intellij/sdk/codesync/alerts/ActivityAlertsTest.kt
new file mode 100644
index 00000000..20b8fc57
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/alerts/ActivityAlertsTest.kt
@@ -0,0 +1,24 @@
+package org.intellij.sdk.codesync.alerts
+
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+
+class ActivityAlertsTest {
+
+    @BeforeEach
+    fun before(){
+
+    }
+
+    @AfterEach
+    fun after(){
+
+    }
+
+    @Test
+    fun validateShowActivityAlert(){
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/auth/AuthActionTest.kt b/src/test/java/org/intellij/sdk/codesync/auth/AuthActionTest.kt
new file mode 100644
index 00000000..542d6f34
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/auth/AuthActionTest.kt
@@ -0,0 +1,24 @@
+package org.intellij.sdk.codesync.auth
+
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+
+class AuthActionTest {
+
+    @BeforeEach
+    fun before(){
+
+    }
+
+    @AfterEach
+    fun after(){
+
+    }
+
+    @Test
+    fun validateActionPerformed(){
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/auth/AuthenticatorTest.kt b/src/test/java/org/intellij/sdk/codesync/auth/AuthenticatorTest.kt
new file mode 100644
index 00000000..43be734d
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/auth/AuthenticatorTest.kt
@@ -0,0 +1,25 @@
+package org.intellij.sdk.codesync.auth
+
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import kotlin.test.assertTrue
+
+class AuthenticatorTest {
+
+    @BeforeEach
+    fun before(){
+
+    }
+
+    @AfterEach
+    fun after(){
+
+    }
+
+    @Test
+    fun validateCreateUser(){
+        assertTrue(true);
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetupTest.kt b/src/test/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetupTest.kt
new file mode 100644
index 00000000..2e208023
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetupTest.kt
@@ -0,0 +1,68 @@
+package org.intellij.sdk.codesync.codeSyncSetup
+
+import org.intellij.sdk.codesync.Helper
+import org.intellij.sdk.codesync.database.Database
+import org.intellij.sdk.codesync.utils.Queries
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import java.io.File
+import kotlin.test.assertEquals
+
+class CodeSyncSetupTest {
+
+    @BeforeEach
+    fun before() {
+        //2. Create directory
+        var file = File(Helper.DIRECTORY_PATH)
+        file.mkdir()
+
+        //3. Connect to db created in step (2) above repo
+        Database.initiate(Helper.CONNECTION_STRING)
+
+        //4. Create user table
+        Database.executeUpdate(Queries.User.CREATE_TABLE)
+
+        //5. Add dummy user
+        Database.executeUpdate(Queries.User.insert("dummy@gmail.com","ASDFC", null, null, false));
+    }
+
+    @AfterEach
+    fun after() {
+        //1. Disconnect database
+        Database.disconnect()
+
+        //2. Remove base repo
+        var file = File(Helper.DIRECTORY_PATH + Helper.DATABASE_FILE)
+        file.delete()
+        file = File(Helper.DIRECTORY_PATH)
+        file.delete()
+    }
+
+    @Test
+    fun validateSaveIamUserTest(){
+        var email = "sample@gmail.com"
+        CodeSyncSetup.saveIamUser(email, "ACCESS", "SECRET")
+        var resultSet = Database.runQuery(Queries.User.get_by_email(email))
+        var row : HashMap<String, String> = resultSet.get(0)
+        assertEquals(email, row["EMAIL"])
+        assertEquals("ACCESS", row["ACCESS_KEY"])
+        assertEquals("SECRET", row["SECRET_KEY"])
+    }
+
+    @Test
+    fun validateDisconnectRepo(){
+
+    }
+
+    @Test
+    fun validateCheckUserAccess(){
+
+    }
+
+    @Test
+    fun validateUploadRepo(){
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/commands/ResumeCodeSyncCommandTest.kt b/src/test/java/org/intellij/sdk/codesync/commands/ResumeCodeSyncCommandTest.kt
new file mode 100644
index 00000000..467d2ceb
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/commands/ResumeCodeSyncCommandTest.kt
@@ -0,0 +1,24 @@
+package org.intellij.sdk.codesync.commands
+
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+
+class ResumeCodeSyncCommandTest {
+
+    @BeforeEach
+    fun before(){
+
+    }
+
+    @AfterEach
+    fun after(){
+
+    }
+
+    @Test
+    fun validateExecute(){
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/database/DatabaseTest.kt b/src/test/java/org/intellij/sdk/codesync/database/DatabaseTest.kt
new file mode 100644
index 00000000..ec5c7c8a
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/database/DatabaseTest.kt
@@ -0,0 +1,68 @@
+package org.intellij.sdk.codesync.database
+
+import org.intellij.sdk.codesync.Helper
+import org.intellij.sdk.codesync.utils.Queries
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import java.io.File
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+
+
+class DatabaseTest {
+
+    @BeforeEach
+    fun before() {
+        //2. Create directory
+        var file = File(Helper.DIRECTORY_PATH)
+        file.mkdir()
+
+        //3. Connect to db created in step (2) above repo
+        Database.initiate(Helper.CONNECTION_STRING)
+
+        //4. Create user table
+        Database.executeUpdate(Queries.User.CREATE_TABLE)
+
+        //5. Add dummy user
+        Database.executeUpdate(Queries.User.insert("dummy@gmail.com","ASDFC", null, null, false));
+    }
+
+    @AfterEach
+    fun after() {
+        //1. Disconnect database
+        Database.disconnect()
+
+        //2. Remove base repo
+        var file = File(Helper.DIRECTORY_PATH + Helper.DATABASE_FILE)
+        file.delete()
+        file = File(Helper.DIRECTORY_PATH)
+        file.delete()
+    }
+
+    @Test
+    fun validateRunQuery(){
+
+        var email = "sample@gmail.com"
+        var access_token = "ACCESS TOKEN"
+        Database.executeUpdate(Queries.User.insert(email, access_token, null, null, true));
+        var resultSet = Database.runQuery(Queries.User.get_by_email(email))
+
+        var row : HashMap<String, String> = resultSet.get(0)
+        assertEquals(1, resultSet.size, "1 row exist.")
+        assertEquals(email, row["EMAIL"])
+        assertEquals(access_token, row["ACCESS_TOKEN"])
+        assertNull(row["SECRET_KEY"])
+        assertNull(row["ACCESS_KEY"])
+        assertEquals(1, Integer.parseInt(row["IS_ACTIVE"]))
+    }
+
+    @Test
+    fun userTableCreation(){
+        var resultSet = Database.runQuery(Queries.User.TABLE_EXIST)
+        assertNotNull(resultSet)
+        assertEquals("user", resultSet[0].get("name"))
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/database/UserTableTest.kt b/src/test/java/org/intellij/sdk/codesync/database/UserTableTest.kt
new file mode 100644
index 00000000..8cb8533c
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/database/UserTableTest.kt
@@ -0,0 +1,110 @@
+package org.intellij.sdk.codesync.database
+
+import org.intellij.sdk.codesync.Helper
+import org.intellij.sdk.codesync.models.UserAccount
+import org.intellij.sdk.codesync.utils.Queries
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import java.io.File
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+
+class UserTableTest {
+
+    @BeforeEach
+    fun before() {
+        //2. Create directory
+        var file = File(Helper.DIRECTORY_PATH)
+        file.mkdir()
+
+        //3. Connect to db created in step (2) above repo
+        Database.initiate(Helper.CONNECTION_STRING)
+
+        //4. Create user table
+        Database.executeUpdate(Queries.User.CREATE_TABLE)
+
+        //5. Add dummy user
+        Database.executeUpdate(Queries.User.insert("dummy@gmail.com","ASDFC", null, null, false));
+    }
+
+    @AfterEach
+    fun after() {
+        //1. Disconnect database
+        Database.disconnect()
+
+        //2. Remove base repo
+        var file = File(Helper.DIRECTORY_PATH + Helper.DATABASE_FILE)
+        file.delete()
+        file = File(Helper.DIRECTORY_PATH)
+        file.delete()
+    }
+
+    @Test
+    fun validateInsertNewUser(){
+        var email = "sample@gmail.com"
+
+        var userAccount = UserAccount(email, "ACCESS_TOKEN")
+        UserTable.insertNewUser(userAccount)
+
+        var resultSet = Database.runQuery(Queries.User.get_by_email(email))
+        var row : HashMap<String, String> = resultSet.get(0)
+        assertEquals(email, row["EMAIL"])
+        assertEquals("ACCESS_TOKEN", row["ACCESS_TOKEN"])
+        assertNull(row["ACCESS_KEY"])
+        assertNull(row["SECRET_KEY"])
+    }
+
+    @Test
+    fun insertDuplicate(){
+        var email = "Dummy@gmail.com"
+
+        var userAccount = UserAccount(email, "ACCESS_TOKEN")
+        AssertionError(UserTable.insertNewUser(userAccount))
+    }
+
+    @Test
+    fun validateUpdateUser(){
+        var email = "sample@gmail.com"
+
+        var userAccount = UserAccount(email, "access token")
+        UserTable.insertNewUser(userAccount)
+
+        userAccount.setSecretKey("secret key")
+        userAccount.setAccessKey("access key")
+        println("Change update: " + UserTable.updateUser(userAccount))
+
+        var resultSet = Database.runQuery(Queries.User.get_by_email(email))
+        var row : HashMap<String, String> = resultSet.get(0)
+        assertEquals(email, row["EMAIL"])
+        assertEquals("access token", row["ACCESS_TOKEN"])
+        assertEquals("access key", row["ACCESS_KEY"])
+        assertEquals("secret key", row["SECRET_KEY"])
+    }
+
+    @Test
+    fun validateGetByEmail(){
+
+        var email = "sample@gmail.com"
+
+        //Inserting a user
+        var newUser = UserAccount(email, "ACCESS_TOKEN")
+        UserTable.insertNewUser(newUser)
+
+        //Getting inserted user.
+        var userAccount = UserTable.getByEmail(email)
+        assertNotNull(userAccount)
+        assertEquals(email, userAccount.getUserEmail())
+
+        //Getting user who does not exist!
+        var notExistingUser = UserTable.getByEmail("nonExistant@gmail.com")
+        assertNull(notExistingUser)
+    }
+
+    @Test
+    fun validateGetActiveUser(){
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/database/migration/MigrateUserTest.kt b/src/test/java/org/intellij/sdk/codesync/database/migration/MigrateUserTest.kt
new file mode 100644
index 00000000..19eb04bd
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/database/migration/MigrateUserTest.kt
@@ -0,0 +1,24 @@
+package org.intellij.sdk.codesync.database.migration
+
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+
+class MigrateUserTest {
+
+    @BeforeEach
+    fun before(){
+
+    }
+
+    @AfterEach
+    fun after(){
+
+    }
+
+    @Test
+    fun validateLoadYmlContent(){
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/model/UserAccountTest.kt b/src/test/java/org/intellij/sdk/codesync/model/UserAccountTest.kt
new file mode 100644
index 00000000..f44b3670
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/model/UserAccountTest.kt
@@ -0,0 +1,118 @@
+package org.intellij.sdk.codesync.model
+
+import org.intellij.sdk.codesync.Helper
+import org.intellij.sdk.codesync.database.Database
+import org.intellij.sdk.codesync.database.UserTable
+import org.intellij.sdk.codesync.models.UserAccount
+import org.intellij.sdk.codesync.utils.Queries
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import java.io.File
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+
+class UserAccountTest {
+
+
+    @BeforeEach
+    fun before() {
+        //2. Create directory
+        var file = File(Helper.DIRECTORY_PATH)
+        file.mkdir()
+
+        //3. Connect to db created in step (2) above repo
+        Database.initiate(Helper.CONNECTION_STRING)
+
+        //4. Create user table
+        Database.executeUpdate(Queries.User.CREATE_TABLE)
+
+        //5. Add dummy user
+        Database.executeUpdate(Queries.User.insert("Dummy@gmail.com","ASDFC", null, null, false));
+    }
+
+    @AfterEach
+    fun after() {
+        //1. Disconnect database
+        Database.disconnect()
+
+        //2. Remove base repo
+        var file = File(Helper.DIRECTORY_PATH + Helper.DATABASE_FILE)
+        file.delete()
+        file = File(Helper.DIRECTORY_PATH)
+        file.delete()
+    }
+
+    @Test
+    fun validatedGetUser(){
+        var userAccount = UserAccount("alpha@gmail.com", "ASDF")
+        UserTable.insertNewUser(userAccount);
+        assertNotNull(userAccount.getUser("alpha@gmail.com"))
+        assertNull(userAccount.getUser("beta@gmail.com"))
+    }
+
+    @Test
+    fun validateGetAccessToken(){
+        var userAccount1 = UserAccount("alpha@gmail.com", "alphaAccess")
+        userAccount1.makeActive();
+        UserTable.insertNewUser(userAccount1);
+
+        var userAccount2 = UserAccount("beta@gmail.com", "betaAccess")
+        UserTable.insertNewUser(userAccount2);
+
+        assertEquals("alphaAccess", UserAccount.getAccessToken("alpha@gmail.com"))
+        assertEquals("betaAccess", UserAccount.getAccessToken("beta@gmail.com"))
+        assertNull(UserAccount.getAccessToken("gamma@gmail.com"))
+
+
+    }
+
+    @Test
+    fun validateGetEmail(){
+        assertNull(UserAccount.getEmail())
+        var userAccount1 = UserAccount("alpha@gmail.com", "alphaAccess")
+        userAccount1.makeActive();
+        UserTable.insertNewUser(userAccount1);
+        assertEquals("alpha@gmail.com", UserAccount.getEmail())
+    }
+
+    @Test
+    fun validateGetAccessTokenByEmail(){
+        assertNull(UserAccount.getAccessTokenByEmail())
+        var userAccount1 = UserAccount("alpha@gmail.com", "alphaAccess")
+        userAccount1.makeActive();
+        UserTable.insertNewUser(userAccount1);
+        assertEquals("alphaAccess", UserAccount.getAccessTokenByEmail())
+    }
+
+    @Test
+    fun validateGetActiveAccessToken(){
+        var userAccount = UserAccount();
+        assertNull(userAccount.getActiveAccessToken())
+
+        var userAccount1 = UserAccount("alpha@gmail.com", "alphaAccess")
+        userAccount1.makeActive();
+        UserTable.insertNewUser(userAccount1);
+        assertEquals("alphaAccess", userAccount.getActiveAccessToken())
+    }
+
+    @Test
+    fun validateSetActiveUser(){
+
+        var userAccount = UserAccount()
+        assertNull(userAccount.getActiveAccessToken())
+
+        var userAccount1 = UserAccount("alpha@gmail.com", "alphaAccess")
+        userAccount1.makeInActive()
+        UserTable.updateUser(userAccount1)
+
+        userAccount1.setActiveUser("alpha@gmail.com", "alphaAccess")
+        assertEquals("alpha@gmail.com", userAccount.getActiveUser().getUserEmail())
+
+        userAccount1.setActiveUser("beta@gmail.com", "betaAccess")
+        assertEquals("beta@gmail.com", userAccount.getActiveUser().getUserEmail())
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/state/StateUtilsTest.kt b/src/test/java/org/intellij/sdk/codesync/state/StateUtilsTest.kt
new file mode 100644
index 00000000..242bc3cb
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/state/StateUtilsTest.kt
@@ -0,0 +1,24 @@
+package org.intellij.sdk.codesync.state
+
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+
+class StateUtilsTest {
+
+    @BeforeEach
+    fun before(){
+
+    }
+
+    @AfterEach
+    fun after(){
+
+    }
+
+    @Test
+    fun validatePopulateGlobalState(){
+
+    }
+
+}
\ No newline at end of file