Add initial pass of Avatar and Erebus