minor rafactoring, now have a test server