Moderator options and lots of refactoring