Should be pretty much done now