Work on new libevent system