Reprogram navigation from procedural to OOP

del.