Part 4 of irc overhaul