some progress, I'm tired...