more progress on framework