More changes toward a working prototype