mostly done now