some progress...but not 100%...yet...