Set changed flag when editing components
Starting to plug in persistence
Merge