Refactor Choice and add initial INSERT statements.