Oops, accidentally had some stuff commented while debugging that I ended up committing.