Welp, I fucked up a little and reverted several commits. Fixing.