Initial code
Switch to options and complete API docs