major refactor of data-structure, added lots of data