More editing support, need to get switches working