Fix setup(), add logger, flesh out choice