Fixed broken-ness, client / server runs again