Adding some basic client stuff