Atlas works with latest code changes now.
First pass on masking.