More progress with framework