Adding switch case stuff