More framework preperation before Sweeper logic