Adding some structure

Mainly a test