WIP on new socket API