well, made some progress...