Adding hardwired mapping, hopefully refining onto:Classifier thing