Should be pretty close to 100% coverage
Got rid of a bunch of debugging stuff