Initial checkin of OpenNap 0.58 code