integrate old and new stuff
add and remove feeds