Changes from yesterday's meetup

I broke each change we made into it's own commit, and then rebased on the latest master before pushing, since changes were made since I last pulled. This keeps the git history looking clean.