mostly done...