Created basic mail system
Fixed conflicts