jpd - made some more progress