More WIP, but this is not the problem, I don't think.