Initial implementation of masking