First draft of options implementation