Taking a survey

I implemented Jwrobes latest branch after he left before I started working on this branch. Check commit notes for details. This should be the latest version of everything so far.

Me during this branch:
![](http://i.imgur.com/dKkOzb1.gif)