Added TODO
Added page-index to refactor-page