Added hackish choice selection. No choices to test yet though