Fix our page creation process, use the one built into class.location, it is cleaner.