Move switch statement to Movie