Message classes complete

I think