Some work toward a working version