Move more stuff into Irc so that we might be able to do reconnection later