Finished initial revamp using epoll