HUGE WIP ON tornado refactoring. Home page and watche page are working