Modal modifiers

Closes #247 as fixed