Added much functionality to ClientViewController