Implement "next" macro and add related notes