WINDUP-133: Stage 2 - Close to having a working Hints/Classifications