ok nearly done