New data structure

I think we should avoid silent failures like these and rather let/make things explode. Will make bug hunting easier and will make it possible for us to handle the errors and let the user know that something is broken.