Make open/close work old way
Commit on every change