More changes, still prototyping