diff --git a/songqueue.go b/songqueue.go
index 5e7da78..c3a9797 100644
--- a/songqueue.go
+++ b/songqueue.go
@@ -5,12 +5,24 @@
  * Copyright (c) 2014 Matthieu Grieger (MIT License)
  */
 
- package main
+package main
 
- type SongQueue struct {
- 	songs []Song
- }
+type SongQueue struct {
+	queue Queue
+}
 
- func NewSongQueue() *SongQueue {
- 	return &SongQueue{}
- }
\ No newline at end of file
+func NewSongQueue() *SongQueue {
+	return &SongQueue{}
+}
+
+func (q *SongQueue) AddSong(s *Song) bool {
+	return false
+}
+
+func (q *SongQueue) NextSong() bool {
+	return false
+}
+
+//func (q *SongQueue) CurrentSong() Song {
+//	return false
+//}