New data structure

tyop :) same for comment above