progress
clean up
clean up more
iterating through collections is working