A ton of work on generators and masks
Not totally working yet but wanted to check in