Feature hierarchy

Merge into master for presentation purposes.