Finalizing admin functionality merges/implementations - start w/ email module merge