choice points

Signed-off-by: Blaise Fonseca <blaisefonseca@hotmail.com>