First step for #75.