Cleaning up core and page
Adding some basic buffer handling to the page class