adding basic support for classes
grunting and fixing some bad defaults