lots of refactoring and adding news items