[WIP] Options (2)

/cc @claus