This is the initial commit from Adam's emailSWQ