first pass at revamped Masker