handle all class items correctly and add hatnav