Moving some logic into PageData (should be pagestate probably)