Have done quite a lot of enhancing to our data structure with a few more tests.