page generators and stuff
attempting to resolve merge conflict