WIP integrating with avetars