Draft of the structures
First working version
Cleanup
Cleanup