Working on adding all needed pages