Structural update

Still, a work in progress