Brieman cat branch

Commented out code is unclean.