Issue 18 partial (file includes)