nit: I know it was like this before but most class names uses dashes, these are camelCase.