More work on clop server