Initial implementation of new 'idle' concept for #8