Fuck it, refactor.

Seriously have no idea what was going on in that anymore.

Use Email Builder as a base