A few more pages ported over