Dunno
Fixed conflict
Starting email stuff