Issue 77

part 1, made before 0841