Progress on side-file, incorporating new changes.