Ported a few more pages