Got the untested framework up for trade
fixing conflicts