Commit 3; 4 tests working. Actually got the changed files.