Could be done, see comment about class names above.