Update

Continued moving Inputs from all the choice functions to one class.