Structural things

Fixes #1