Still debugging. I should probably branch. Meh.