WIP: Switching hopper over to generic Avatar framework