Tentatively finished. Fixed problem with rename going to wrong place.