some progress, but eh