Some work on initial data structures, probably a bit of a yak shave