in a good place, almost ready for code review