Wip/datastructures