Merged my switch changes in, not quite working