Categories work now
.
Merge remote-tracking branch 'origin/Linksatmah' into Linksatmah