made some progress, refs still broken on test2