Adding message class and utils, altering config slightly.