Reverted last three commits.  All errors in judgement.