WIP still making pages work together