Feature/syndication refactor

any particular reason we're leaving all of this code around in the test?