in progress...
seems to work....