Cleaned up based on testing. Now playing still not working.