WIP: Changes to looping + tests for code