Start implementing live msg but not
Merge