Still unworking, but progress...