diff --git a/src/goof.py b/src/goof.py
index ce47741..7dcb3b1 100644
--- a/src/goof.py
+++ b/src/goof.py
@@ -58,3 +58,7 @@ print(len(song_output_list), song_output_list)
 # getting song  by album ref
 song_output_list = cache.pull_songs(album_ref=album_input.reference)
 print(len(song_output_list), song_output_list)
+
+# getting album
+album_output_list = cache.pull_albums(album_ref=album_input.ref)
+print(album_output_list[0])
diff --git a/src/music_kraken/database/new_database.py b/src/music_kraken/database/new_database.py
index cacb797..4b25159 100644
--- a/src/music_kraken/database/new_database.py
+++ b/src/music_kraken/database/new_database.py
@@ -38,6 +38,11 @@ SELECT id, text, language, song_id
 FROM Lyrics
 WHERE {where};
 """
+ALBUM_QUERY = """
+SELECT Album.id AS album_id, title, copyright, album_status, year, date, country, barcode
+FROM Album
+WHERE {where};
+"""
 
 
 class Database:
@@ -312,8 +317,43 @@ class Database:
 
         return [self.get_song_from_row(song_result=song_result) for song_result in song_rows]       
 
+    def get_album_from_row(self, album_result) -> Album:
+        album_id = album_result['album_id']
+
+        album_obj = Album(
+            id_=album_id,
+            title=album_result['title'],
+            copyright_=album_result['copyright'],
+            album_status=album_result['album_status'],
+            language=album_result['language'],
+            year=album_result['year'],
+            date=album_result['date'],
+            country=album_result['country'],
+            barcode=album_result['barcode']
+        )
+
+        # getting the tracklist
+        tracklist: List[Song] = self.pull_songs(album_ref=Reference(id_=album_id))
+        for track in tracklist:
+            album_obj.add_song(track.reference, name=track.title)
+
+        return album_obj
+
     def pull_albums(self, album_ref: Reference = None) -> List[Album]:
-        pass
+        """
+        This function is used to get matching albums/releses 
+        from one song id (a reference object)
+        :param album_ref:
+        :return requested_album_list:
+        """
+        where = "1=1"
+        if album_ref is not None:
+            where = f"Album.id=\"{album_ref.id}\""
+
+        query = ALBUM_QUERY.format(where=where)
+        self.cursor.execute(query)
+
+        album_rows = self.cursor.fetchall()
 
 if __name__ == "__main__":
     cache = Database("")
diff --git a/src/music_kraken/database/objects/song.py b/src/music_kraken/database/objects/song.py
index 0498593..e813bc9 100644
--- a/src/music_kraken/database/objects/song.py
+++ b/src/music_kraken/database/objects/song.py
@@ -264,13 +264,20 @@ class Album(DatabaseObject):
         self.barcode: str = barcode
 
         self.song_ref_list: List[Reference] = song_ref_list
+        self.track_names = {}
 
-    def add_song(self, song_ref: Reference):
+    def add_song(self, song_ref: Reference, name: str = None):
+        if name is not None:
+            self.track_names[song_ref.id] = name
+        
         for existing_song_ref in self.song_ref_list:
             if song_ref == existing_song_ref:
                 return
         self.song_ref_list.append(song_ref)
 
+        if song_ref.id not in self.track_names:
+            self.track_names[song_ref.id] = None
+
 
 
 
diff --git a/test.db b/test.db
index 62e6591..bcddebc 100644
Binary files a/test.db and b/test.db differ