Framework reworking finished, add