added choices

tests not fully passing yet