anv: Merge in my TODO list items