server code implementd, added new message class to extend
merge