Revert "Revert "Milestone 3 working, Iterator replaced""

This reverts commit db7210cd3c94e89526d314f8c0b0cf174ad59255.