Some uh, more progress! Reworked some of the page handling