Added a bit more structure.
Even more structure.