Significantly less broken code. Yayyy!