[WIP] More option-type work