diff --git a/index.mjs b/index.mjs
index 171337e..6f59a68 100644
--- a/index.mjs
+++ b/index.mjs
@@ -4,33 +4,29 @@ import axios from "axios";
 import qs from "qs";
 export class PlexAPIOAuth {
   constructor(
-    clientId = "",
+    clientId,
     product = "Plex-API-OAuth",
     device = "Web-Client",
     version = "1",
     forwardUrl = "",
     platform = "Web",
-    plexTVAuthToken = "",
-    plexTVUserData = {},
-    plexServers = {},
-    plexLibraries = {},
-    plexMovies = {},
-    plexMusic = {},
-    plexTVShows = {}
+    plexTVAuthToken,
+    plexTVUserData,
+    plexServers = [],
+    plexDevices = []
   ) {
-    this.plexTVAuthToken = plexTVAuthToken;
-    this.plexTVUserData = plexTVUserData;
     this.clientId = clientId;
     this.product = product;
     this.device = device;
     this.version = version;
     this.forwardUrl = forwardUrl;
     this.platform = platform;
+
+    this.plexTVAuthToken = plexTVAuthToken;
+    this.plexTVUserData = plexTVUserData;
     this.plexServers = plexServers;
-    this.plexLibraries = plexLibraries;
-    this.plexMovies = plexMovies;
-    this.plexMusic = plexMusic;
-    this.plexTVShows = plexTVShows;
+    this.plexDevices = plexDevices;
+
     this.plexClientInformation = {
       clientId: this.clientId, // This is a unique identifier used to identify your app with Plex. - If none is provided a new one is generated and saved locally
       product: this.product, // Name of your application - Defaults to Plex-API-OAuth
@@ -41,145 +37,144 @@ export class PlexAPIOAuth {
     };
   }
 
-  get ClientId() {
-    return this.clientId;
-  }
-  set ClientId(clientId) {
-    this.clientId = clientId;
-  }
-  get PlexTVAuthToken() {
-    return this.plexTVAuthToken;
-  }
-  set PlexTVAuthToken(plexTVAuthToken) {
+  SetPlexSession({
+    clientId,
+    product = "Plex-API-OAuth",
+    device = "Web-Client",
+    version = "1",
+    forwardUrl = "",
+    platform = "Web",
+    plexTVAuthToken,
+    plexTVUserData,
+    plexServers = [],
+    plexDevices = [],
+    selectedPlexServer,
+  }) {
     this.plexTVAuthToken = plexTVAuthToken;
-  }
-  get PlexTVUserData() {
-    return this.plexTVUserData;
-  }
-  set PlexTVUserData(plexTVUserData) {
     this.plexTVUserData = plexTVUserData;
-  }
-  get Product() {
-    return this.product;
-  }
-  set Product(product) {
+    this.selectedPlexServer = selectedPlexServer;
+    this.clientId = clientId;
     this.product = product;
-  }
-  get Device() {
-    return this.device;
-  }
-  set Device(device) {
     this.device = device;
-  }
-  get Version() {
-    return this.version;
-  }
-  set Version(version) {
     this.version = version;
-  }
-  get ForwardUrl() {
-    return this.forwardUrl;
-  }
-  set ForwardUrl(forwardUrl) {
     this.forwardUrl = forwardUrl;
-  }
-  get Platform() {
-    return this.platform;
-  }
-  set Platform(platform) {
     this.platform = platform;
-  }
-  get PlexServers() {
-    return this.plexServers;
-  }
-  set PlexServers(plexServers) {
     this.plexServers = plexServers;
+    this.plexDevices = plexDevices;
+
+    this.plexClientInformation = {
+      clientId: this.clientId, // This is a unique identifier used to identify your app with Plex. - If none is provided a new one is generated and saved locally
+      product: this.product, // Name of your application - Defaults to Plex-API-OAuth
+      device: this.device, // The type of device your application is running on - Defaults to "Web Client"
+      version: this.version, // Version of your application - Defaults to 1
+      forwardUrl: this.forwardUrl, // Url to forward back to after signing in - Defaults to an empty string
+      platform: this.platform, // Platform your application runs on - Defaults to 'Web'
+    };
   }
-  get PlexLibraries() {
-    return this.plexLibraries;
+
+  SavePlexSession() {
+    console.log("Saving State:");
+    console.log({
+      plexTVAuthToken: this.plexTVAuthToken,
+      plexTVUserData: this.plexTVUserData,
+      selectedPlexServer: this.selectedPlexServer,
+      clientId: this.clientId,
+      product: this.product,
+      device: this.device,
+      version: this.version,
+      forwardUrl: this.forwardUrl,
+      platform: this.platform,
+      plexServers: this.plexServers,
+      plexDevices: this.plexDevices,
+      plexClientInformation: this.plexClientInformation,
+    });
+    window.localStorage.setItem(
+      "plexSessionData",
+      JSON.stringify({
+        plexTVAuthToken: this.plexTVAuthToken,
+        plexTVUserData: this.plexTVUserData,
+        selectedPlexServer: this.selectedPlexServer,
+        clientId: this.clientId,
+        product: this.product,
+        device: this.device,
+        version: this.version,
+        forwardUrl: this.forwardUrl,
+        platform: this.platform,
+        plexServers: this.plexServers,
+        plexDevices: this.plexDevices,
+        plexLibraries: this.plexLibraries,
+        plexMovieLibraries: this.plexMovieLibraries,
+        plexMusicLibraries: this.plexMusicLibraries,
+        plexTVShowLibraries: this.plexTVShowLibraries,
+        plexMovies: this.plexMovies,
+        plexMusic: this.plexMusic,
+        plexTVShows: this.plexTVShows,
+        plexClientInformation: this.plexClientInformation,
+      })
+    );
   }
-  set PlexLibraries(plexLibraries) {
-    this.plexLibraries = plexLibraries;
-  }
-  get PlexMovies() {
-    return this.plexMovies;
-  }
-  set PlexMovies(plexMovies) {
-    this.plexMovies = plexMovies;
-  }
-  get PlexMusic() {
-    return this.plexMusic;
-  }
-  set PlexMusic(plexMusic) {
-    this.plexMusic = plexMusic;
-  }
-  get PlexTVShows() {
-    return this.plexTVShows;
-  }
-  set PlexTVShows(plexTVShows) {
-    this.plexTVShows = plexTVShows;
-  }
-  get PlexClientInformation() {
-    return this.plexClientInformation;
-  }
-  set PlexClientInformation(plexClientInformation) {
-    this.plexClientInformation = plexClientInformation;
+
+  LoadPlexSession() {
+    console.log("Loading State:");
+    this.SetPlexSession(
+      JSON.parse(window.localStorage.getItem("plexSessionData"))
+    );
+    console.log(JSON.parse(window.localStorage.getItem("plexSessionData")));
   }
 
   GenerateClientId() {
     this.clientId = v4();
     this.plexClientInformation.clientId = this.clientId;
+    console.log("Generated ClientId");
   }
 
-  PlexLogin() {
+  async PlexLogin() {
+    if (this.ClientId === null || this.clientId === undefined) {
+      this.GenerateClientId();
+    }
     var plexOauth = new PlexOauth(this.plexClientInformation);
-    plexOauth
-      .requestHostedLoginURL()
-      .then((data) => {
-        let [hostedUILink, pinId] = data;
+    let data = await plexOauth.requestHostedLoginURL().catch((err) => {
+      throw err;
+    });
 
-        console.log("Plex Auth URL:");
-        console.log(hostedUILink); // UI URL used to log into Plex
-        console.log("Plex Pin ID:");
-        console.log(pinId);
+    let [hostedUILink, pinId] = data;
 
-        window.open(hostedUILink, "_blank");
-        window.focus();
+    console.log("Plex Auth URL:");
+    console.log(hostedUILink); // UI URL used to log into Plex
+    console.log("Plex Pin ID:");
+    console.log(pinId);
 
-        /*
-         * You can now navigate the user's browser to the 'hostedUILink'. This will include the forward URL
-         * for your application, so when they have finished signing into Plex, they will be redirected back
-         * to the specified URL. From there, you just need to perform a query to check for the auth token.
-         * (See Below)
-         */
+    window.open(hostedUILink, "_blank");
+    window.focus();
 
-        // Check for the auth token, once returning to the application
+    /*
+     * You can now navigate the user's browser to the 'hostedUILink'. This will include the forward URL
+     * for your application, so when they have finished signing into Plex, they will be redirected back
+     * to the specified URL. From there, you just need to perform a query to check for the auth token.
+     * (See Below)
+     */
 
-        plexOauth
-          .checkForAuthToken(pinId, 1000, 10)
-          .then((authToken) => {
-            if (authToken !== null) {
-              this.plexTVAuthToken = authToken;
-              console.log("Plex Authentication Successful");
-              return true;
-            } else {
-              console.log("Plex Authentication Failed");
-              return false;
-            }
-            // An auth token will only be null if the user never signs into the hosted UI, or you stop checking for a new one before they can log in
-          })
+    // Check for the auth token, once returning to the application
 
-          .catch((err) => {
-            throw err;
-          });
-      })
+    let authToken = await plexOauth
+      .checkForAuthToken(pinId, 1000, 10)
       .catch((err) => {
         throw err;
       });
+
+    if (authToken !== null) {
+      this.plexTVAuthToken = authToken;
+      console.log("Plex Authentication Successful");
+      return authToken;
+    } else {
+      console.log("Plex Authentication Failed");
+      return null;
+    }
+    // An auth token will only be null if the user never signs into the hosted UI, or you stop checking for a new one before they can log in
   }
 
-  GetPlexUserData() {
-    axios({
+  async GetPlexUserData() {
+    let response = await axios({
       method: "GET",
       url:
         "https://plex.tv/api/v2/user?" +
@@ -189,36 +184,159 @@ export class PlexAPIOAuth {
           "X-Plex-Token": this.plexTVAuthToken,
         }),
       headers: { accept: "application/json" },
-    })
-      .then((response) => {
-        console.log(response);
-        console.log(response.status);
-        if (response.status === 200) {
-          this.plexUserData = response.data;
-          return true;
-        }
-        if (response.status === 401) {
-          console.log("Authentican Token Failed Validation");
-          return false;
-        }
-      })
-      .catch(function (error) {
-        if (error.response) {
-          // The request was made and the server responded with a status code
-          // that falls out of the range of 2xx
-          console.log(error.response.data);
-          console.log(error.response.status);
-          console.log(error.response.headers);
-        } else if (error.request) {
-          // The request was made but no response was received
-          // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
-          // http.ClientRequest in node.js
-          console.log(error.request);
-        } else {
-          // Something happened in setting up the request that triggered an Error
-          console.log("Error", error.message);
-        }
-        console.log(error.config);
+    }).catch(function (error) {
+      if (error.response) {
+        // The request was made and the server responded with a status code
+        // that falls out of the range of 2xx
+        console.log(error.response.data);
+        console.log(error.response.status);
+        console.log(error.response.headers);
+      } else if (error.request) {
+        // The request was made but no response was received
+        // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
+        // http.ClientRequest in node.js
+        console.log(error.request);
+      } else {
+        // Something happened in setting up the request that triggered an Error
+        console.log("Error", error.message);
+      }
+      console.log(error.config);
+    });
+
+    console.log(response);
+    console.log(response.status);
+    if (response.status === 200) {
+      console.log("Authentican Token Validated Successfully");
+      this.plexTVUserData = response.data;
+      console.log("Populated User Data Successfully");
+      return response.data;
+    }
+    if (response.status === 401) {
+      console.log("Authentican Token Failed Validation");
+      return null;
+    }
+  }
+
+  async GetPlexServers() {
+    let response = await axios({
+      method: "GET",
+      url:
+        "https://plex.tv/api/v2/resources?" +
+        qs.stringify({
+          includeHttps: 1,
+          includeRelay: 1,
+          includeIPv6: 1,
+          "X-Plex-Product": this.plexClientInformation.product,
+          "X-Plex-Client-Identifier": this.plexClientInformation.clientId,
+          "X-Plex-Token": this.plexTVAuthToken,
+        }),
+      headers: { accept: "application/json" },
+    }).catch((err) => {
+      throw err;
+    });
+    console.log("Plex Devices:");
+    console.log(response);
+    this.plexDevices = response.data;
+    this.plexServers = response.data
+      ?.filter((obj) => obj?.product?.includes("Plex Media Server"))
+      ?.map((obj) => {
+        return {
+          accessToken: obj?.accessToken,
+          clientIdentifier: obj?.clientIdentifier,
+          connections: obj?.connections,
+          localConnections: obj?.connections?.filter(
+            (obj) => obj?.local == true
+          ),
+          relayConnections: obj?.connections?.filter(
+            (obj) => obj?.relay == true
+          ),
+          createdAt: obj?.createdAt,
+          device: obj?.device,
+          dnsRebindingProtection: obj?.dnsRebindingProtection,
+          home: obj?.home,
+          httpsRequired: obj?.httpsRequired,
+          lastSeenAt: obj?.lastSeenAt,
+          libraries: [],
+          name: obj?.name,
+          natLoopbackSupported: obj?.natLoopbackSupported,
+          owned: obj?.owned,
+          ownerId: obj?.ownerId,
+          platform: obj?.platform,
+          platformVersion: obj?.platformVersion,
+          presence: obj?.presence,
+          product: obj?.product,
+          productVersion: obj?.productVersion,
+          provides: obj?.provides,
+          publicAddress: obj?.publicAddress,
+          publicAddressMatches: obj?.publicAddressMatches,
+          relay: obj?.relay,
+          sourceTitle: obj?.sourceTitle,
+          synced: obj?.accessTokensynced,
+        };
       });
+    return response.data;
+  }
+
+  async GetPlexLibraries(server) {
+    let response = await axios({
+      method: "GET",
+      url:
+        server?.relayConnections[0].uri +
+        "/library/sections/?" +
+        qs.stringify({
+          "X-Plex-Token": server?.accessToken,
+        }),
+      headers: { accept: "application/json" },
+    }).catch((err) => {
+      throw err;
+    });
+
+    let plexLibraries = response?.data?.MediaContainer?.Directory;
+    let plexMusicLibraries = response?.data?.MediaContainer?.Directory?.filter(
+      (obj) => obj.type === "artist"
+    );
+    let plexMovieLibraries = response?.data?.MediaContainer?.Directory?.filter(
+      (obj) => obj.type === "movie"
+    );
+    let plexTVShowLibraries = response?.data?.MediaContainer?.Directory?.filter(
+      (obj) => obj.type === "show"
+    );
+
+    console.log(this.plexServers[this.plexServers.indexOf(server)]);
+    server.libraries = {
+      plexLibraries: plexLibraries,
+      plexMusicLibraries: plexMusicLibraries,
+      plexMovieLibraries: plexMovieLibraries,
+      plexTVShowLibraries: plexTVShowLibraries,
+    };
+    this.plexServers[this.plexServers.indexOf(server)] = server;
+    return {
+      plexLibraries: plexLibraries,
+      plexMusicLibraries: plexMusicLibraries,
+      plexMovieLibraries: plexMovieLibraries,
+      plexTVShowLibraries: plexTVShowLibraries,
+    };
+  }
+
+  async GetPlexLibraryContent(server, library) {
+    let response = await axios({
+      method: "GET",
+      url:
+        server?.relayConnections[0].uri +
+        "/library/sections/" +
+        library.uuid +
+        "?" +
+        qs.stringify({
+          "X-Plex-Token": server?.accessToken,
+        }),
+      headers: { accept: "application/json" },
+    }).catch((err) => {
+      throw err;
+    });
+    console.log(response);
+    return true;
+    // this.plexMusic = response?.data?.MediaContainer?.Directory;
+
+    // console.log(this.plexLibraries);
   }
 }
diff --git a/package.json b/package.json
index 062bf27..4f09cae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "plex-api-oauth",
-  "version": "1.0.37",
+  "version": "1.0.124",
   "description": "An NPM Module designed to make Plex Media Server and plex.tv API calls easier to implement in JavaScript and React projects",
   "main": "index.mjs",
   "type": "module",