Attempts to implement User Story 4. This is currently broken, but I'm
committing it at Tim's request.