Issue 77

Part 1, done before 8041,