Moar client logic updates