WIP for new Newsesque model
Fix some more features