Merge pull request #1 from AGSPhoenix/master

Add a bunch of stuff (merge from AGSPhoenix)
Merge pull request #2 from AGSPhoenix/master

Add a whole lot of stuff
Now with more information!
Revised loop. Still doesn't work.