New data structure WIP.