Initial code review for #94