more testing, but it looks like this branch is bust