added beginning of class and trait support.