Email mod commit - unfinished