Work on data structure set up