Methods moved to MessageModel

Still not complete