Adding the avatars and things like that