more framework scaffolding and change to increment mode