Bug fixes, Exclude() back to mutation
Simplified
Work in progress