added additional todo re error catching