diff --git a/include/Containers.h b/include/Containers.h
index b273cb7..e6c429a 100644
--- a/include/Containers.h
+++ b/include/Containers.h
@@ -53,8 +53,8 @@ class HashTable {
     HashTable ( HashTable && ) noexcept = default;
     HashTable &operator= ( HashTable && ) noexcept = default;
 
-    void ht_insert ( const std::string &key, Track* t );
-    Track* ht_lookup ( const std::string &key ) const;
+    void ht_insert ( const std::string &key, std::shared_ptr<Track> t );
+    std::shared_ptr<Track> ht_lookup ( const std::string &key ) const;
     bool ht_delete ( const std::string &key );
 
     std::vector<std::string> listAll () const;
@@ -72,7 +72,7 @@ class HashTable {
     struct Entry {
         std::string key;
         uint64_t hash = 0;
-        Track* track;
+        std::shared_ptr<Track> track;
     };
 
     // helpers
diff --git a/src/HashTable.cpp b/src/HashTable.cpp
index 63471c0..0f209a7 100644
--- a/src/HashTable.cpp
+++ b/src/HashTable.cpp
@@ -108,7 +108,7 @@ std::ptrdiff_t ht::probe ( const std::string &key, uint64_t hash, bool insert )
 #endif
 }  // probe
 
-void ht::ht_insert( const std::string& key, Track* t ) {
+void ht::ht_insert( const std::string& key, std::shared_ptr<Track> t ) {
     //double loadFactor = static_cast<double> ( size_ ) / static_cast<double> ( ctrl_.size());
 
     if ( loadFactor_ > MAX_LOAD ) rehash( ctrl_.size() * 2 );
@@ -121,7 +121,7 @@ void ht::ht_insert( const std::string& key, Track* t ) {
         tmp.key             = key;
         tmp.hash            = hash;
         tmp.track           = t;
-        entries_.at( idx )  = std::move( tmp );
+        entries_.at( idx )  = std::move(tmp);
         ++size_;
     } else {
         entries_.at( idx ).track = t;
@@ -129,7 +129,7 @@ void ht::ht_insert( const std::string& key, Track* t ) {
     ctrl_.at( idx ) = fingerprint( hash );
 }
 
-Track* ht::ht_lookup( const std::string& key ) const {
+std::shared_ptr<Track> ht::ht_lookup( const std::string& key ) const {
     uint64_t hash = hashString( key );
     auto idx = probe( key, hash, false );
     if ( idx != -1 ) return entries_.at( static_cast<std::size_t> ( idx )).track;
diff --git a/src/PlayerLocal.cpp b/src/PlayerLocal.cpp
index 8530f8f..f0e6323 100644
--- a/src/PlayerLocal.cpp
+++ b/src/PlayerLocal.cpp
@@ -60,8 +60,8 @@ void PlayerLocal::scanLibrary(){
 void PlayerLocal::loadLibrary() {
     db_.fetchAll( library );
     for ( auto t : library ) {
-        tracks_.ht_insert(t.title.toCString(), &t );
-        artists_.ht_insert( t.artist.toCString(), &t );
-        albums_.ht_insert( t.album.toCString(), &t );
+        tracks_.ht_insert(t.title.toCString(), std::make_shared<Track> (t) );
+        artists_.ht_insert( t.artist.toCString(), std::make_shared<Track> (t) );
+        albums_.ht_insert( t.album.toCString(), std::make_shared<Track> (t) );
     }
 }