Fixing outstanding bugs. Port over to Highlights branch.
getting closer
working categorization