Move page type earlier..?