Change many functions to use within 'page' class