New functionality, classes are gaining shape