Final commit. Has all of the intended functionality (still without all
the bells and whistles).