@txels reviewed up to here.