refactored iterators
Merge branch 'master' of https://github.com/CopernicaMarketingSoftware/SMART-TPL
iterators no longer have to be stacked inside the handler class
small bug fixes, plus added @todo statements to the code
added a couple of @todos
update merge