Separating out various bits of functionality into separate pages.