Not building currently, getting up for Craig to see latest structure. Implementing volatile data structures