New data structure

@justinvdm Cool, let me try this.