#48 Added Avatar functionality