FIREBALLS
merge
remove all the stuff
all the new stuff