Server implemented - possible bugs