some progress, but mostly just need to swap computers