Get a few emails working, tidy up some logic, email refactoring doesnt feel right but its better