move a bunch to extras