Finishing up under the hood work

Have a bug with page changes