Part 3 of irc overhaul