Some minor progress. Also, I'm an idiot.