Adding a little more of the structure and documentation