more progress towards working server