Commit 5; 6 tests passing. Only the target tests remain.