Mini Merge

Making this because I gotta revert some stupid changes to mentors that don't fit our awesome mentors.