Cats!! oh and some code changes too.

But mostly cats!