Process option

Squashes #1139 for us