Update with some more ideas
Extend tables and add some notes