Started Merging as internet and irc being a pain.
Marvin can you take a look at this please, always crashes with the mappings for some reason?