Swap to the structure outlined
Add zip
Add 'classes'
Add sequence numbers
Update generated data
Add more sample data