More NOTES, more TODO.