Undo changeover, rough tests, demo app