working on more organization and the page... page.