Todo

Condensed from TODO.md at build time: 16 open item(s), 33 completed.