Part 2 of irc overhaul