Start of rebuilding into a better datastructure
Merge branch 'LocalCrijnBranch'