Unfinished repository changes 2