Added a bunch more stuff, got mail working