fix client_id, take out blocks to async (derp)