SOLID FUCKIN REDESIGN