Switch works now (preview needs fixing still though on edit screen)