move TODOs to where action needs to be taken
add 'page' to array *before* loop