lots done.. working now