Mostly done now