Last save of working Mac solution before making a few significant changes