changes on client

adding back 2 java file and comment out @override notation to make
client able to build