Still need to clean up this switch