done more than that, have marked old one final.  breaks networking project, will update that separately.