major but general update based on learning from Probate project