Latest commit from working branch. May break things.