The NAUI AOW is an extension of the OW class. It hits on everything you already learned but more in depth. I remember mine being so much fun because I was already familiar with my gear. It’s great to get the opportunity to do several dives of different types with other divers.