added message field to client
Made code error free and ready for merging