Removed returns in iterator, replaced by continues. WIP