Finished re architect of page security.