Issue #22 remaining files