Started new Redesign and refactoring