Finalise structure.

Multiple elements test failing.