Add avatar stuff whilst I'm here