Added structure (ish)
Fiddling with structure