commiting various changes that probably aren't good yet, so that I can
go home and work on my desktop instead of sitting here with my laptop.
:P Not that there's anything wrong with the laptop. -- most useful
commit message ever.