Mostly done, I think