messages now working - need furhter work
conflicts resolved