Buncha tests 'n such
fix weird indentation error
We're gonna use the faster version now woo!