Adds some more structure

Not tested yet