Merge branch 'amen' into docs
Cleaned up invention