Reorganize a bit
Fully configurable passepartout
Separate out state variables.