Never mind those last two commits. Everything was broke. Now it's all fixed!