Remvoing some old checks, not entirely sure how it hangs together, but tests pass