Initial hierarchy. Fixes #2