Refactor: Last commit made it harder to test, so rolled back a bit so I could fix the sanity tests