Revert "asd"

This reverts commit 2ce3f9fb3d8a0b9eb621e9fe5873a7401b8cebaf.
Revert "Revert "asd""

This reverts commit de5e2a2e671604d56685f2f153321636a51318e7.
Bug fix

Server was never started after refactoring