PARTIAL: All implemented code now has passing tests.