Working on move to OOP
oop working
fixed ignores and cancels
Added pages, updated nav