more sketchy bits of companion / server