Some iterators changed to be off-the-end
Add commandline args and class creation to main