Made Choice Add and Value Delete work. Still buggy.