added minimal new framework
and a bit more