removed the encryption stuff, what was I thinking. added in regenerate and some other changes