Reimplemented server-interface (included lots of tests)