Got all nonemail stuff working like clockwork