Looks like I bork a ton of shat in the past few commits. This should clear that right up :)