Separate Message class
Fix things