minor redacts and todos