update

poly  thing? to class structure with switch statements