working on messaging
merge conflict solved
working on per item, terence working on messaging