Refactored.  Also trying to work around problem with NFSN and POST.