Patched this.file annoyances
All tests are passing \o//