Commit 2; 4 tests working
Commit 3; 4 tests working. Actually got the changed files.
Commit 5; 6 tests passing. Only the target tests remain.
commit before merging branches
commit before merging the two branches - Leon