Working on a switch to complete class integration