Added classes, worked on features