Add expert to next/previous logic (TODO)