Fix property editing
Start working on loading last state