Working on architecture/inheritance