This reworks the preliminary masking support, and changes the data file layout. Fixes #4 (closed), #5 (closed).