Adds more logic
Completes options selection