Redesign + classes