cleaning up...still need to fix emailing