Feature/syndication refactor

Usually I don't, but since this is a test and I plan to fix I thought it was OK.