WIP -- still issues with hero copy