Work up until 11:30am Monday
Added Message class