Client Optional initial
Client Option finished?
removed unnecessary classes