Added selectable options

Also prep for alerting