calculate choices immediately
minor changes
new unit- and integration tests