Still fighting against iterator. Trying to simplify them