Some new classes, some new ops