Option Aware classifier - needs some final touches