diff --git a/include/Engine/Sound/SoundSystem.h b/include/Engine/Sound/SoundSystem.h
index 0035a3bb..0555feb4 100644
--- a/include/Engine/Sound/SoundSystem.h
+++ b/include/Engine/Sound/SoundSystem.h
@@ -22,9 +22,9 @@ class SoundSystem
 {
 public:
     SoundSystem() { }
-    SoundSystem(EventBroker* eventBroker);
+    SoundSystem(World* world, EventBroker* eventBroker);
     ~SoundSystem();
-    void Update() { } // Update emitters
+    void Update(); // Update emitters
 private:
     // Private setters and getters for working with glm
     void setListenerPos(glm::vec3 pos) { alListener3f(AL_POSITION, pos.x, pos.y, pos.z); };
diff --git a/src/Engine/Sound/SoundSystem.cpp b/src/Engine/Sound/SoundSystem.cpp
index 965f97a4..b9736096 100644
--- a/src/Engine/Sound/SoundSystem.cpp
+++ b/src/Engine/Sound/SoundSystem.cpp
@@ -1,8 +1,9 @@
 #include "Sound/SoundSystem.h"
 
-SoundSystem::SoundSystem(EventBroker* eventBroker)
+SoundSystem::SoundSystem(World* world, EventBroker* eventBroker)
 {
     m_EventBroker = eventBroker;
+    m_World = world;
     // Initialize OpenAL
     m_ALCdevice = alcOpenDevice(nullptr);
     if (m_ALCdevice != nullptr) {
@@ -16,20 +17,29 @@ SoundSystem::SoundSystem(EventBroker* eventBroker)
     alDistanceModel(AL_INVERSE_DISTANCE);
 
     EVENT_SUBSCRIBE_MEMBER(m_EPlaySound, &SoundSystem::OnPlaySound);
-    //m_EPlaySound = decltype(m_EPlaySound)(std::bind(&SoundSystem::OnPlaySound, this, std::placeholders::_1));
-    //m_EventBroker->Subscribe(m_EPlaySound);
 }
 
 SoundSystem::~SoundSystem()
-{ 
+{
     alcDestroyContext(m_ALCcontext);
     alcCloseDevice(m_ALCdevice);
     delete m_ALCcontext;
     delete m_ALCdevice;
 }
 
+void SoundSystem::Update()
+{
+    // Should only be one listener.
+    auto listenerComponents = m_World->GetComponents("Listener");
+    for (auto it = listenerComponents->begin(); it != listenerComponents->end(); it++) {
+        EntityID listener = (*it).EntityID;
+        auto transform = m_World->GetComponent(listener, "Transform");
+        setListenerPos(transform["Position"]);
+    }
+}
+
 ALuint SoundSystem::createSource()
-{ 
+{
     ALuint source;
     alGenSources((ALuint)1, &source);
     alSourcei(source, AL_REFERENCE_DISTANCE, 1.0);
@@ -60,7 +70,6 @@ bool SoundSystem::OnPlaySound(const Events::PlaySound & e)
     sauce.ALsource = source;
     sauce.SoundResource = sound;
     playSound(sauce);
-    LOG_INFO("You are playing an imaginary sound now! :D");
     return false;
 }
 
diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp
index 66ab6fae..1863fa38 100644
--- a/src/Game/Game.cpp
+++ b/src/Game/Game.cpp
@@ -65,7 +65,14 @@ Game::Game(int argc, char* argv[])
         networkFunction();
     }
     EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &Game::debugOnInputCommand);
-    m_SoundSystem = new SoundSystem(m_EventBroker);
+    m_SoundSystem = new SoundSystem(m_World, m_EventBroker);
+
+    auto soundListenerCube = m_World->CreateEntity();
+    m_World->AttachComponent(soundListenerCube, "Listener");
+    m_World->AttachComponent(soundListenerCube, "Transform");
+    auto model = m_World->AttachComponent(soundListenerCube, "Model");
+    model["Resource"] = "Models/Core/UnitCube.obj";
+    model["Color"] = glm::vec4(1, 0, 0, 1);
 
     m_LastTime = glfwGetTime();
 }