Add more to the outline
Restructure things, and TBD for all