Added some client stuff