Making progress, just need to debug the categorical attribute
More progress, nearly all tests passing now
All tests passing.
Removed debugging