beginnings of better framework handling