added message class, missed previously