Fixet cat/subcat.

There is still a change to be made to the finance table though. And it's a big change.