diff --git a/src/AlbumPlayer.tsx b/src/AlbumPlayer.tsx
index 9f54957..6b12ab0 100644
--- a/src/AlbumPlayer.tsx
+++ b/src/AlbumPlayer.tsx
@@ -1,39 +1,33 @@
-import {useEffect, useState} from "react";
+import {useState} from "react";
 import hostName from "./Config.ts";
-import {TrackInfo} from "./TrackInfo.tsx";
+import {AlbumInfo} from "./AlbumInfo.ts";
 
 interface AlbumPlayerProps {
-  albumHash: string
+  albumHash: string,
+  albumInfo: AlbumInfo
 }
 
 export default function AlbumPlayer(props: Readonly<AlbumPlayerProps>) {
-  const [trackNum, setTrackNum] = useState(1)
-  const [trackInfo, setTrackInfo] = useState<TrackInfo>()
-
-  useEffect(() => {
-    if (props.albumHash) {
-      let fetched = fetch(`${hostName}/track/${props.albumHash}/${trackNum}`)
-      fetched.then(response => {
-        if (response.ok) {
-          response.json().then(body => {
-                setTrackInfo(body)
-              }
-          )
-        }
-      })
-    }
-  }, [props.albumHash, trackNum])
+  const [trackNum, setTrackNum] = useState<number>(0)
+  const [isAlbumOver, setIsAlbumOver] = useState(false)
 
+  let album = props.albumInfo
   function handleNextTrack() {
-    setTrackNum(trackNum+1)
+    if(!isAlbumOver && trackNum+1 === props.albumInfo.trackList.length) {
+      setIsAlbumOver(true)
+    } else {
+      setTrackNum(trackNum+1)
+    }
+
   }
 
-  if(props.albumHash) {
+  if(props.albumHash && album) {
+    console.log(album)
     return (
         <div className={"player"}>
-          <div>{trackInfo?.artist ?? ""} - {trackInfo?.trackTitle ?? ""}</div>
-          <audio title={trackInfo?.trackTitle} controls={true} autoPlay={true} preload={"metadata"}
-                 src={`${hostName}/music/album/${props.albumHash}/${trackNum}`}
+          <div>{album.trackList[trackNum].trackArtist} - {album.trackList[trackNum].trackTitle}</div>
+          <audio title={album.trackList[trackNum].trackTitle} controls={true} autoPlay={true} preload={"metadata"}
+                 src={`${hostName}/music/album/${props.albumHash}/track/${trackNum}`}
                  onEnded={handleNextTrack} />
         </div>
     )
diff --git a/src/AlbumTrackInfo.ts b/src/AlbumTrackInfo.ts
new file mode 100644
index 0000000..b383fb9
--- /dev/null
+++ b/src/AlbumTrackInfo.ts
@@ -0,0 +1,5 @@
+export interface AlbumTrackInfo {
+  trackNumber: number,
+  trackArtist: string,
+  trackTitle: string
+}
\ No newline at end of file
diff --git a/src/App.tsx b/src/App.tsx
index f17e002..61183e4 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,18 +1,20 @@
 import React, {useEffect, useState} from 'react'
 import './App.css'
-import {AlbumInfo} from "./AlbumInfo.ts"
+import {AlbumMetadata} from "./AlbumMetadata.ts"
 import PhotoContainer from "./PhotoContainer.tsx";
 import AlbumPlayer from "./AlbumPlayer.tsx";
 import hostName from "./Config.ts";
+import {AlbumInfo} from "./AlbumInfo.ts";
 
 
 
 function App() {
-  const [albums, setAlbums] = useState(Array<AlbumInfo>)
+  const [albums, setAlbums] = useState(Array<AlbumMetadata>)
   const [selectedAlbum, setSelectedAlbum] = useState("")
+  const [albumInfo, setAlbumInfo] = useState<AlbumInfo>()
 
   useEffect(() => {
-    let fetched = fetch(`${hostName}/albums`)
+    let fetched = fetch(`${hostName}/album`)
     fetched.then(response => {
       if(response.ok) {
         response.json().then( body =>
@@ -22,6 +24,19 @@ function App() {
     })
   }, [])
 
+  useEffect(() => {
+    if (selectedAlbum) {
+      let fetched = fetch(`${hostName}/album/${selectedAlbum}`)
+      fetched.then(response => {
+        if (response.ok) {
+          response.json().then(body =>
+              setAlbumInfo(body)
+          )
+        }
+      })
+    }
+  }, [selectedAlbum])
+
   function handleAlbumClick(event: React.MouseEvent<HTMLElement>) {
     setSelectedAlbum(event.currentTarget.id)
   }
@@ -29,7 +44,7 @@ function App() {
   return (
       <div className={"gallery"}>
         <PhotoContainer imageList={albums} albumClickHandler={handleAlbumClick}/>
-        <AlbumPlayer albumHash={selectedAlbum} key={selectedAlbum}/>
+        {albumInfo ? <AlbumPlayer albumHash={selectedAlbum} albumInfo={albumInfo} key={selectedAlbum}/> : <div></div> }
       </div>
   )
 }
diff --git a/src/PhotoContainer.tsx b/src/PhotoContainer.tsx
index 0fccd85..60550d8 100644
--- a/src/PhotoContainer.tsx
+++ b/src/PhotoContainer.tsx
@@ -1,9 +1,9 @@
-import {AlbumInfo} from "./AlbumInfo.ts";
+import {AlbumMetadata} from "./AlbumMetadata.ts";
 import React from "react";
 import hostName from "./Config.ts";
 
 interface PhotoContainerProps {
-  imageList: AlbumInfo[],
+  imageList: AlbumMetadata[],
   albumClickHandler: (event: React.MouseEvent<HTMLElement>) => void
 }
 export default function PhotoContainer(props: PhotoContainerProps) {