Added Radio button logic - incomplete