added draft for a new design, updated class names