I think this is what #392 was referring to but I need the user to confirm before I close it out.