Server - works partially; all unittests are passing