A lot more work on the NetworkClient. Still not finished though.