Finish chaining. Exclude the choices from dependencies list
Add temp TODO comments

fix these bugs!