initial server commit - currently separate