More work on new server loop