More notebook work. Getting there...