diff --git a/crabidy/Cargo.toml b/crabidy/Cargo.toml
index a739972..94726ed 100644
--- a/crabidy/Cargo.toml
+++ b/crabidy/Cargo.toml
@@ -9,3 +9,4 @@ edition = "2021"
 crabidy-core = { path = "../crabidy-core" }
 tonic = "0.9"
 tokio = { version = "1", features = ["full"] }
+tokio-stream = "0.1"
diff --git a/crabidy/src/main.rs b/crabidy/src/main.rs
index 07d81a0..b83186c 100644
--- a/crabidy/src/main.rs
+++ b/crabidy/src/main.rs
@@ -1,17 +1,31 @@
-use std::vec;
+use std::{pin::Pin, vec};
 
 use crabidy_core::proto::crabidy::{
-    library_service_server::{LibraryService, LibraryServiceServer},
-    GetLibraryNodeRequest, GetLibraryNodeResponse, GetTrackRequest, GetTrackResponse, LibraryNode,
-    LibraryNodeState,
+    crabidy_service_server::{CrabidyService, CrabidyServiceServer},
+    AppendNodeRequest, AppendTrackRequest, EmptyRequest, EmptyResponse, GetActiveTrackResponse,
+    GetLibraryNodeRequest, GetLibraryNodeResponse, GetQueueResponse, GetQueueUpdatesRequest,
+    GetQueueUpdatesResponse, GetTrackRequest, GetTrackResponse, GetTrackUpdatesRequest,
+    GetTrackUpdatesResponse, LibraryNode, LibraryNodeState, QueueLibraryNodeRequest,
+    QueueTrackRequest, RemoveTracksRequest, ReplaceWithNodeRequest, ReplaceWithTrackRequest,
+    SaveQueueRequest, SetCurrentTrackRequest,
 };
-use tonic::{transport::Server, Request, Response, Status};
+use tokio::sync::mpsc;
+use tokio_stream::wrappers::ReceiverStream;
+use tonic::{codegen::futures_core::Stream, transport::Server, Request, Response, Status};
+
+type GetQueueUpdatesStream =
+    Pin<Box<dyn Stream<Item = Result<GetQueueUpdatesResponse, Status>> + Send>>;
+type GetTrackUpdatesStream =
+    Pin<Box<dyn Stream<Item = Result<GetTrackUpdatesResponse, Status>> + Send>>;
 
 #[derive(Debug, Default)]
-pub struct Library {}
+pub struct Service {}
 
 #[tonic::async_trait]
-impl LibraryService for Library {
+impl CrabidyService for Service {
+    type GetQueueUpdatesStream = GetQueueUpdatesStream;
+    type GetTrackUpdatesStream = GetTrackUpdatesStream;
+
     async fn get_library_node(
         &self,
         request: Request<GetLibraryNodeRequest>,
@@ -48,15 +62,140 @@ impl LibraryService for Library {
         let reply = GetTrackResponse { track: None };
         Ok(Response::new(reply))
     }
+    async fn queue_track(
+        &self,
+        request: Request<QueueTrackRequest>,
+    ) -> Result<Response<EmptyResponse>, Status> {
+        let reply = EmptyResponse {};
+        Ok(Response::new(reply))
+    }
+    async fn queue_library_node(
+        &self,
+        request: Request<QueueLibraryNodeRequest>,
+    ) -> Result<Response<EmptyResponse>, Status> {
+        let reply = EmptyResponse {};
+        Ok(Response::new(reply))
+    }
+    async fn replace_with_track(
+        &self,
+        request: Request<ReplaceWithTrackRequest>,
+    ) -> Result<Response<EmptyResponse>, Status> {
+        let reply = EmptyResponse {};
+        Ok(Response::new(reply))
+    }
+    async fn replace_with_node(
+        &self,
+        request: Request<ReplaceWithNodeRequest>,
+    ) -> Result<Response<EmptyResponse>, Status> {
+        let reply = EmptyResponse {};
+        Ok(Response::new(reply))
+    }
+    async fn append_track(
+        &self,
+        request: Request<AppendTrackRequest>,
+    ) -> Result<Response<EmptyResponse>, Status> {
+        let reply = EmptyResponse {};
+        Ok(Response::new(reply))
+    }
+    async fn append_node(
+        &self,
+        request: Request<AppendNodeRequest>,
+    ) -> Result<Response<EmptyResponse>, Status> {
+        let reply = EmptyResponse {};
+        Ok(Response::new(reply))
+    }
+    async fn remove_tracks(
+        &self,
+        request: Request<RemoveTracksRequest>,
+    ) -> Result<Response<EmptyResponse>, Status> {
+        let reply = EmptyResponse {};
+        Ok(Response::new(reply))
+    }
+    async fn set_current_track(
+        &self,
+        request: Request<SetCurrentTrackRequest>,
+    ) -> Result<Response<EmptyResponse>, Status> {
+        let reply = EmptyResponse {};
+        Ok(Response::new(reply))
+    }
+    async fn get_queue_updates(
+        &self,
+        request: Request<GetQueueUpdatesRequest>,
+    ) -> Result<Response<Self::GetQueueUpdatesStream>, Status> {
+        let reply = GetQueueUpdatesResponse {
+            queue_update_result: None,
+        };
+        // https://giphy.com/gifs/dog-mechanic-i-have-no-idea-what-im-doing-VXCPgZwEP7f1e
+        let (tx, rx) = mpsc::channel(128);
+        let output_stream = ReceiverStream::new(rx);
+        Ok(Response::new(
+            Box::pin(output_stream) as Self::GetQueueUpdatesStream
+        ))
+    }
+    async fn get_queue(
+        &self,
+        request: Request<EmptyRequest>,
+    ) -> Result<Response<GetQueueResponse>, Status> {
+        let reply = GetQueueResponse { queue: None };
+        Ok(Response::new(reply))
+    }
+    async fn save_queue(
+        &self,
+        request: Request<SaveQueueRequest>,
+    ) -> Result<Response<EmptyResponse>, Status> {
+        let reply = EmptyResponse {};
+        Ok(Response::new(reply))
+    }
+    async fn toggle_play(
+        &self,
+        request: Request<EmptyRequest>,
+    ) -> Result<Response<EmptyResponse>, Status> {
+        let reply = EmptyResponse {};
+        Ok(Response::new(reply))
+    }
+    async fn stop(
+        &self,
+        request: Request<EmptyRequest>,
+    ) -> Result<Response<EmptyResponse>, Status> {
+        let reply = EmptyResponse {};
+        Ok(Response::new(reply))
+    }
+    async fn get_active_track(
+        &self,
+        request: Request<EmptyRequest>,
+    ) -> Result<Response<GetActiveTrackResponse>, Status> {
+        let reply = GetActiveTrackResponse {
+            track: None,
+            play_state: 0,
+            completion: 0,
+        };
+        Ok(Response::new(reply))
+    }
+    async fn get_track_updates(
+        &self,
+        request: Request<GetTrackUpdatesRequest>,
+    ) -> Result<Response<Self::GetTrackUpdatesStream>, Status> {
+        let reply = GetTrackUpdatesResponse {
+            track: None,
+            play_state: 0,
+            completion: 0,
+        };
+        // https://giphy.com/gifs/dog-mechanic-i-have-no-idea-what-im-doing-VXCPgZwEP7f1e
+        let (tx, rx) = mpsc::channel(128);
+        let output_stream = ReceiverStream::new(rx);
+        Ok(Response::new(
+            Box::pin(output_stream) as Self::GetTrackUpdatesStream
+        ))
+    }
 }
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let addr = "[::1]:50051".parse()?;
-    let crabidy_service = Library::default();
+    let crabidy_service = Service::default();
 
     Server::builder()
-        .add_service(LibraryServiceServer::new(crabidy_service))
+        .add_service(CrabidyServiceServer::new(crabidy_service))
         .serve(addr)
         .await?;