Mostly woking, however genricInputs are not quite correct
Seems to all work