More work on exclude logic
more exclude-file logic