Reamped data structure, added pages