Made some changes, added some simple iterator functionality for later use...
Merge branch 'local'