diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d2f51d5..f0fbb95 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="a23023fe-943e-49fb-aaac-72229e9d9f43" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/eight_queens/lib/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/eight_queens/lib/main.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/eight_queens/lib/queens.dart" beforeDir="false" afterPath="$PROJECT_DIR$/eight_queens/lib/queens.dart" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -50,10 +50,10 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/eight_queens/lib/main.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1132">
+            <state relative-caret-position="-1133">
               <caret line="56" column="81" lean-forward="true" selection-start-line="56" selection-start-column="81" selection-end-line="56" selection-end-column="81" />
               <folding>
                 <element signature="e#0#42#0" expanded="true" />
@@ -62,11 +62,14 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/eight_queens/lib/queens.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="272">
-              <caret line="68" column="7" selection-start-line="68" selection-start-column="7" selection-end-line="68" selection-end-column="7" />
+            <state relative-caret-position="443">
+              <caret line="93" column="48" selection-start-line="93" selection-start-column="48" selection-end-line="93" selection-end-column="48" />
+              <folding>
+                <element signature="e#0#2016#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -99,11 +102,11 @@
       <list>
         <option value="$PROJECT_DIR$/.github/workflows/main.yml" />
         <option value="$PROJECT_DIR$/eight_queens/lib/results.dart" />
-        <option value="$PROJECT_DIR$/eight_queens/lib/queens.dart" />
         <option value="$PROJECT_DIR$/eight_queens/test/eight_test.dart" />
         <option value="$PROJECT_DIR$/eight_queens/test/widget_test.dart" />
         <option value="$PROJECT_DIR$/eight_queens/pubspec.yaml" />
         <option value="$PROJECT_DIR$/eight_queens/lib/main.dart" />
+        <option value="$PROJECT_DIR$/eight_queens/lib/queens.dart" />
       </list>
     </option>
   </component>
@@ -339,20 +342,30 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/eight_queens/test/eight_test.dart">
+    <entry file="file://$PROJECT_DIR$/eight_queens/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="405">
-          <caret line="27" selection-start-line="27" selection-end-line="27" />
+        <state relative-caret-position="360">
+          <caret line="24" column="19" selection-start-line="24" selection-start-column="19" selection-end-line="24" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/eight_queens/lib/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1133">
+          <caret line="56" column="81" lean-forward="true" selection-start-line="56" selection-start-column="81" selection-end-line="56" selection-end-column="81" />
           <folding>
-            <element signature="e#1#43#0" expanded="true" />
+            <element signature="e#0#42#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/eight_queens/lib/queens.dart">
+    <entry file="file://$PROJECT_DIR$/eight_queens/test/eight_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="68" column="7" selection-start-line="68" selection-start-column="7" selection-end-line="68" selection-end-column="7" />
+        <state relative-caret-position="405">
+          <caret line="27" selection-start-line="27" selection-end-line="27" />
+          <folding>
+            <element signature="e#1#43#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -367,19 +380,12 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/eight_queens/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="24" column="19" selection-start-line="24" selection-start-column="19" selection-end-line="24" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/eight_queens/lib/main.dart">
+    <entry file="file://$PROJECT_DIR$/eight_queens/lib/queens.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1132">
-          <caret line="56" column="81" lean-forward="true" selection-start-line="56" selection-start-column="81" selection-end-line="56" selection-end-column="81" />
+        <state relative-caret-position="443">
+          <caret line="93" column="48" selection-start-line="93" selection-start-column="48" selection-end-line="93" selection-end-column="48" />
           <folding>
-            <element signature="e#0#42#0" expanded="true" />
+            <element signature="e#0#2016#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/eight_queens/lib/queens.dart b/eight_queens/lib/queens.dart
index 8eac5a1..682f8e8 100644
--- a/eight_queens/lib/queens.dart
+++ b/eight_queens/lib/queens.dart
@@ -1,7 +1,8 @@
-/**
- * Queen Resolver class
- * Solved using algorithm found in: https://www.geeksforgeeks.org/n-queen-problem-using-branch-and-bound/
- */
+///
+///Queen Resolver class
+///Solved using algorithm found in: https://www.geeksforgeeks.org/n-queen-problem-backtracking-3/
+///Adapted for use with Dart and Flutter
+///
 
 import 'package:shared_preferences/shared_preferences.dart';
 
@@ -9,6 +10,10 @@ class QueenResolver {
 
   int count = 0;
 
+  ///
+  /// Checks if a queen can be placed on a [board] in a [row] and [col]
+  /// Returns a [bool] if it's safe to place it [true] or not [false]
+  ///
   Future<bool> isSafe(board, int row, int col, int n) async {
       // Check row on the left side
       for (var i = 0; i < col; i++) {
@@ -40,8 +45,15 @@ class QueenResolver {
       return true;
   }
 
+  ///
+  /// Main eight queens algorithm
+  /// Receives a single [board] and [col] positions, as well as [n] queens.
+  /// Will return [true] when solved.
+  ///
   Future<bool> solveQueens(board, int col, int n) async {
 
+    /* Solve for the base case : All queens are placed
+    * Then, store it into local storage */
     if (col >= n) {
       count++;
       storeSolution(board).then((value) {
@@ -50,6 +62,7 @@ class QueenResolver {
     }
 
     var res = false;
+    /** Consider the [col] and try placing it on the [board] **/
     for(int i = 0; i < n; i++) {
       if(await isSafe(board, i, col, n)){
         board[i][col] = 1;
@@ -59,7 +72,10 @@ class QueenResolver {
     }
     return res;
   }
-  
+
+  /// Stores a complete [board] into [SharedPreferences]
+  /// Because the [board] is not completely initialized, it requires to convert all [null] values to [0].
+  /// Stores also the current [count] into [SharedPreferences]
   Future storeSolution(List<List<int>> board) async {
     for(int i = 0; i < board.length; i++) {
       for(int x = 0; x < board[i].length ; x++) {
@@ -73,6 +89,10 @@ class QueenResolver {
     await prefs.setInt('count', count);
   }
 
+  ///
+  /// Function entryway to solve for [n] queens.
+  /// Will return [count] for the app's purposes
+  ///
   Future<int> solve(int n) async {
     // Create the initial queens board
      List<List<int>> board = new List.generate(n, (_) => new List(n));