WIP framework rework