Adding some client logic, take three