Working prototype with new options