fixing bugs
working on emailing
fixing things
fixing conflict