Almost done with Client side, next I have to finish Server Side