prelim stage for part 5
merged commits