Adding another layer of abstraction. Maybe this is a bad idea.
Fixed configuration change.
completed adding files
merged in the bug fix.