Adding drawing and server logic