some refactoring, choice box works

choicebox works, but the refactoring for choice nodes needs to happen